diff --git a/VERSION b/VERSION
index 4fee16a7..f3120341 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-B1-rc6-5-g8ad2d5f949+1
\ No newline at end of file
+B1-rc6-6-gb979752989+1
\ No newline at end of file
diff --git a/client/spice/include/spice b/client/spice/include/spice
deleted file mode 120000
index 945c9b46..00000000
--- a/client/spice/include/spice
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/client/spice/include/spice.h b/client/spice/include/spice/spice.h
similarity index 100%
rename from client/spice/include/spice.h
rename to client/spice/include/spice/spice.h
diff --git a/client/spice/include/messages.h b/client/spice/src/messages.h
similarity index 100%
rename from client/spice/include/messages.h
rename to client/spice/src/messages.h
diff --git a/client/spice/include/rsa.h b/client/spice/src/rsa.h
similarity index 100%
rename from client/spice/include/rsa.h
rename to client/spice/src/rsa.h
diff --git a/client/spice/src/spice.c b/client/spice/src/spice.c
index 34360897..c5f53d52 100644
--- a/client/spice/src/spice.c
+++ b/client/spice/src/spice.c
@@ -17,7 +17,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "spice.h"
+#include "spice/spice.h"
 #include "utils.h"
 #include "common/debug.h"