diff --git a/qubes/vm/standalonevm.py b/qubes/vm/standalonevm.py
new file mode 100644
index 00000000..d745dfa0
--- /dev/null
+++ b/qubes/vm/standalonevm.py
@@ -0,0 +1,31 @@
+#!/usr/bin/python2 -O
+# vim: fileencoding=utf-8
+
+#
+# The Qubes OS Project, https://www.qubes-os.org/
+#
+# Copyright (C) 2016  Marek Marczykowski-Górecki
+#                              <marmarek@invisiblethingslab.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+import qubes.events
+import qubes.vm.qubesvm
+
+class StandaloneVM(qubes.vm.qubesvm.QubesVM):
+    '''Standalone Application VM'''
+
+    pass
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 75bf4c1f..c515210a 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -216,6 +216,7 @@ fi
 %{python_sitelib}/qubes/vm/appvm.py*
 %{python_sitelib}/qubes/vm/dispvm.py*
 %{python_sitelib}/qubes/vm/qubesvm.py*
+%{python_sitelib}/qubes/vm/standalonevm.py*
 %{python_sitelib}/qubes/vm/templatevm.py*
 
 %dir %{python_sitelib}/qubes/vm/mix
diff --git a/setup.py b/setup.py
index 29eddd84..533981f1 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@ if __name__ == '__main__':
             'qubes.vm': [
                 'AppVM = qubes.vm.appvm:AppVM',
                 'TemplateVM = qubes.vm.templatevm:TemplateVM',
+                'StandaloneVM = qubes.vm.standalonevm:StandaloneVM',
                 'AdminVM = qubes.vm.adminvm:AdminVM',
             ],
             'qubes.ext': [