diff --git a/meta-extras/packages/gypsy/files/fixups.patch b/meta/packages/gypsy/files/fixups.patch
similarity index 100%
rename from meta-extras/packages/gypsy/files/fixups.patch
rename to meta/packages/gypsy/files/fixups.patch
diff --git a/meta-extras/packages/gypsy/gypsy.inc b/meta/packages/gypsy/gypsy.inc
similarity index 100%
rename from meta-extras/packages/gypsy/gypsy.inc
rename to meta/packages/gypsy/gypsy.inc
diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/packages/gypsy/gypsy_0.6.bb
new file mode 100644
index 0000000000..68a07ffcd7
--- /dev/null
+++ b/meta/packages/gypsy/gypsy_0.6.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GPS Controlling Daemon"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 dbus bluez-libs dbus-glib libxslt"
+
+SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" 
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta-extras/packages/gypsy/gypsy_svn.bb b/meta/packages/gypsy/gypsy_svn.bb
similarity index 100%
rename from meta-extras/packages/gypsy/gypsy_svn.bb
rename to meta/packages/gypsy/gypsy_svn.bb