diff --git a/q/Qemu/Qemu-2.1.2-GCC-4.4.7-system-VDE2.eb b/q/QEMU/QEMU-2.1.2-GCC-4.4.7-system-VDE2.eb
similarity index 100%
rename from q/Qemu/Qemu-2.1.2-GCC-4.4.7-system-VDE2.eb
rename to q/QEMU/QEMU-2.1.2-GCC-4.4.7-system-VDE2.eb
diff --git a/q/Qemu/Qemu-2.1.2-GCC-4.4.7-system.eb b/q/QEMU/QEMU-2.1.2-GCC-4.4.7-system.eb
similarity index 100%
rename from q/Qemu/Qemu-2.1.2-GCC-4.4.7-system.eb
rename to q/QEMU/QEMU-2.1.2-GCC-4.4.7-system.eb
diff --git a/q/Qemu/Qemu-2.1.2-GCC-4.8.3-VDE2.eb b/q/QEMU/QEMU-2.10.0-GCC-4.4.7-system-VDE2.eb
similarity index 70%
rename from q/Qemu/Qemu-2.1.2-GCC-4.8.3-VDE2.eb
rename to q/QEMU/QEMU-2.10.0-GCC-4.4.7-system-VDE2.eb
index 2f7a18cc..32b2dd9f 100644
--- a/q/Qemu/Qemu-2.1.2-GCC-4.8.3-VDE2.eb
+++ b/q/QEMU/QEMU-2.10.0-GCC-4.4.7-system-VDE2.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = "QEMU"
-version = "2.1.2"
+version = "2.10.0"
 versionsuffix = "-VDE2"
 
 homepage = 'http://wiki.qemu.org/Main_Page'
@@ -10,14 +10,12 @@ virtualizer."""
 
 configopts = "--target-list=x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user"
 
-toolchain = {'name': 'GCC', 'version': '4.8.3'}
+toolchain = {'name': 'GCC', 'version': '4.4.7-system'}
 
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://wiki.qemu-project.org/download/']
 
-builddependencies = [('GLib', '2.40.0', '', ('gompi', '1.5.16'),),
-                     ('VDE2', '2.3.2')
-]
+patches = ['qemu-slirp-smb-2.9.0.patch']
 
 dependencies = [
     ('VDE2', '2.3.2'),
@@ -25,7 +23,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/qemu-x86_64'],
-    'dirs': ['bin', 'etc', 'share'],
+    'dirs': ['bin', 'share'],
 }
 
 moduleclass = 'tools'
diff --git a/q/Qemu/Qemu-2.1.2-intel-2015b.eb b/q/QEMU/QEMU-2.10.0-GCC-4.4.7-system.eb
similarity index 72%
rename from q/Qemu/Qemu-2.1.2-intel-2015b.eb
rename to q/QEMU/QEMU-2.10.0-GCC-4.4.7-system.eb
index ad6a3284..a1d99c47 100644
--- a/q/Qemu/Qemu-2.1.2-intel-2015b.eb
+++ b/q/QEMU/QEMU-2.10.0-GCC-4.4.7-system.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = "QEMU"
-version = "2.1.2"
+version = "2.10.0"
 
 homepage = 'http://wiki.qemu.org/Main_Page'
 description = """QEMU is a generic and open source machine emulator and
@@ -9,16 +9,18 @@ virtualizer."""
 
 configopts = "--target-list=x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user"
 
-toolchain = {'name': 'intel', 'version': '2015b'}
+toolchain = {'name': 'GCC', 'version': '4.4.7-system'}
 
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://wiki.qemu-project.org/download/']
 
-builddependencies = [('GLib', '2.40.0')]
+builddependencies = []
+
+patches = ['qemu-slirp-smb-2.9.0.patch']
 
 sanity_check_paths = {
     'files': ['bin/qemu-x86_64'],
-    'dirs': ['bin', 'etc', 'share'],
+    'dirs': ['bin', 'share'],
 }
 
 moduleclass = 'tools'
diff --git a/q/Qemu/Qemu-2.1.2-GCC-4.9.3-binutils-2.25.eb b/q/QEMU/QEMU-2.9.0-GCC-4.4.7-system-VDE2.eb
similarity index 67%
rename from q/Qemu/Qemu-2.1.2-GCC-4.9.3-binutils-2.25.eb
rename to q/QEMU/QEMU-2.9.0-GCC-4.4.7-system-VDE2.eb
index 1e0541d9..81cdc4f0 100644
--- a/q/Qemu/Qemu-2.1.2-GCC-4.9.3-binutils-2.25.eb
+++ b/q/QEMU/QEMU-2.9.0-GCC-4.4.7-system-VDE2.eb
@@ -1,7 +1,8 @@
 easyblock = 'ConfigureMake'
 
 name = "QEMU"
-version = "2.1.2"
+version = "2.9.0"
+versionsuffix = "-VDE2"
 
 homepage = 'http://wiki.qemu.org/Main_Page'
 description = """QEMU is a generic and open source machine emulator and
@@ -9,19 +10,20 @@ virtualizer."""
 
 configopts = "--target-list=x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user"
 
-toolchain = {'name': 'GCC', 'version': '4.9.3-binutils-2.25'}
+toolchain = {'name': 'GCC', 'version': '4.4.7-system'}
 
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://wiki.qemu-project.org/download/']
 
-#builddependencies = []
-builddependencies = [('GLib', '2.40.0')]
+patches = ['qemu-slirp-smb-2.9.0.patch']
 
-patches = ['qemu-slirp-smb.patch']
+dependencies = [
+    ('VDE2', '2.3.2'),
+]
 
 sanity_check_paths = {
     'files': ['bin/qemu-x86_64'],
-    'dirs': ['bin', 'etc', 'share'],
+    'dirs': ['bin', 'share'],
 }
 
 moduleclass = 'tools'
diff --git a/q/Qemu/Qemu-2.1.2-foss-2015b.eb b/q/QEMU/QEMU-2.9.0-GCC-4.4.7-system.eb
similarity index 72%
rename from q/Qemu/Qemu-2.1.2-foss-2015b.eb
rename to q/QEMU/QEMU-2.9.0-GCC-4.4.7-system.eb
index 52ca2784..a12fd2b9 100644
--- a/q/Qemu/Qemu-2.1.2-foss-2015b.eb
+++ b/q/QEMU/QEMU-2.9.0-GCC-4.4.7-system.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = "QEMU"
-version = "2.1.2"
+version = "2.9.0"
 
 homepage = 'http://wiki.qemu.org/Main_Page'
 description = """QEMU is a generic and open source machine emulator and
@@ -9,16 +9,18 @@ virtualizer."""
 
 configopts = "--target-list=x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user"
 
-toolchain = {'name': 'foss', 'version': '2015b'}
+toolchain = {'name': 'GCC', 'version': '4.4.7-system'}
 
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://wiki.qemu-project.org/download/']
 
-builddependencies = [('GLib', '2.40.0')]
+builddependencies = []
+
+patches = ['qemu-slirp-smb-2.9.0.patch']
 
 sanity_check_paths = {
     'files': ['bin/qemu-x86_64'],
-    'dirs': ['bin', 'etc', 'share'],
+    'dirs': ['bin', 'share'],
 }
 
 moduleclass = 'tools'
diff --git a/q/QEMU/qemu-slirp-smb-2.9.0.patch b/q/QEMU/qemu-slirp-smb-2.9.0.patch
new file mode 100644
index 00000000..4ba715c2
--- /dev/null
+++ b/q/QEMU/qemu-slirp-smb-2.9.0.patch
@@ -0,0 +1,12 @@
+--- net/slirp.c.orig    2017-08-30 18:50:41.000000000 +0200
++++ net/slirp.c 2017-09-04 13:58:05.000000000 +0200
+@@ -679,6 +679,9 @@
+             "printing = bsd\n"
+             "disable spoolss = yes\n"
+             "usershare max shares = 0\n"
++            "log level = 1\n"
++            "allow insecure wide links=yes\n"
++            "wide links=yes\n"
+             "[qemu]\n"
+             "path=%s\n"
+             "read only=no\n"
diff --git a/q/Qemu/qemu-slirp-smb.patch b/q/QEMU/qemu-slirp-smb.patch
similarity index 100%
rename from q/Qemu/qemu-slirp-smb.patch
rename to q/QEMU/qemu-slirp-smb.patch