diff --git a/debian/changelog b/debian/changelog
index 2b491cf..707d9e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gaia (0.1.2-6) unstable; urgency=low
+
+  * [6357d709] Add patch to fix FTBFS with libgps >= 2.90. (Closes:
+    #560242) - thanks to KiBi and Kumar Appaiah.
+  * [2a5062ed] Require libgps-dev >= 2.90 to build.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Tue, 15 Dec 2009 23:28:06 +0100
+
 gaia (0.1.2-5) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/control b/debian/control
index cc87165..106bf7d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jordà Polo <jorda@ettin.org>
 Uploaders: Adam Cécile (Le_Vert) <gandalf@le-vert.net>
 Build-Depends: debhelper (>= 5), quilt (>= 0.40), scons, libjpeg62-dev,
  libpng12-dev, libsdl1.2-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev,
- libgps-dev
+ libgps-dev (>= 2.90)
 Standards-Version: 3.7.3
 
 Package: gaia
diff --git a/debian/patches/06_libgps-2.90-fix.patch b/debian/patches/06_libgps-2.90-fix.patch
new file mode 100644
index 0000000..69f0f23
--- /dev/null
+++ b/debian/patches/06_libgps-2.90-fix.patch
@@ -0,0 +1,11 @@
+--- a/programs/gaia/GPSSourceGPSD.cc
++++ b/programs/gaia/GPSSourceGPSD.cc
+@@ -23,7 +23,7 @@ GPSSourceGPSD::GPSSourceGPSD(char *serve
+ 	if ((m_GPS = gps_open(server, port)) == 0)
+ 		throw Exception("gps_open() failed");
+ 
+-	if (gps_query(m_GPS, "w+x\n") != 0)
++	if(gps_stream(m_GPS, WATCH_ENABLE, NULL) != 0)
+ 		throw Exception("initial gps_query() failed");
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 28baf8f..35d08ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_scons_gps_check.patch
 04_wms_url_update.patch
 05_curl_setopt_args.patch
+06_libgps-2.90-fix.patch