diff -Nru x2x-1.30/debian/changelog x2x-1.30/debian/changelog
--- x2x-1.30/debian/changelog	2013-02-02 12:56:22.000000000 +0000
+++ x2x-1.30/debian/changelog	2013-02-02 19:12:20.000000000 +0000
@@ -1,8 +1,8 @@
-x2x (1.30-1ubuntu1) raring; urgency=low
+x2x (1.30-2) unstable; urgency=low
 
-  * Move libs from AM_LDFLAGS to LIBS to fix linking with --as-needed
+  * Merge ubuntu patch, included upstream (closes: #699617)
 
- -- Adam Conrad <adconrad@ubuntu.com>  Sat, 02 Feb 2013 05:48:32 -0700
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 02 Feb 2013 19:12:20 +0000
 
 x2x (1.30-1) unstable; urgency=low
 
diff -Nru x2x-1.30/debian/control x2x-1.30/debian/control
--- x2x-1.30/debian/control	2013-02-02 12:48:58.000000000 +0000
+++ x2x-1.30/debian/control	2013-02-02 19:11:23.000000000 +0000
@@ -1,6 +1,5 @@
 Source: x2x
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Barak A. Pearlmutter <bap@debian.org>
+Maintainer: Barak A. Pearlmutter <bap@debian.org>
 Build-Depends: debhelper (>= 9), dh-autoreconf,
 	pkg-config,
 	libx11-dev, libxtst-dev, xutils-dev
diff -Nru x2x-1.30/debian/patches/debian-changes x2x-1.30/debian/patches/debian-changes
--- x2x-1.30/debian/patches/debian-changes	1970-01-01 00:00:00.000000000 +0000
+++ x2x-1.30/debian/patches/debian-changes	2013-02-02 19:13:15.000000000 +0000
@@ -0,0 +1,46 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ x2x (1.30-2) unstable; urgency=low
+ .
+   * Merge ubuntu patch, included upstream (closes: #699617)
+Author: Barak A. Pearlmutter <bap@debian.org>
+Bug-Debian: http://bugs.debian.org/699617
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- x2x-1.30.orig/Makefile.am
++++ x2x-1.30/Makefile.am
+@@ -5,7 +5,7 @@
+ #
+ 
+ AM_CFLAGS = $(X11_CFLAGS) -Wall
+-AM_LDFLAGS = $(X11_LIBS)
++LIBS = $(X11_LIBS)
+ 
+ bin_PROGRAMS = x2x
+ 
+@@ -19,7 +19,7 @@ dist_man1_MANS = x2x.1
+ if WIN32
+ 
+ AM_CFLAGS += -DWIN_2_X
+-AM_LDFLAGS += -luser32 -lgdi32 # Ugly hack
++LIBS += -luser32 -lgdi32 # Ugly hack
+ x2x_SOURCES += keymap.c winmsg.c x2xwin.rc
+ 
+ .o:.rc
diff -Nru x2x-1.30/debian/patches/ld-as-needed.patch x2x-1.30/debian/patches/ld-as-needed.patch
--- x2x-1.30/debian/patches/ld-as-needed.patch	2013-02-02 12:56:09.000000000 +0000
+++ x2x-1.30/debian/patches/ld-as-needed.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Description: Move libs from AM_LDFLAGS to LIBS to fix linking with --as-needed
-Author: Adam Conrad <adconrad@ubuntu.com>
-Forwarded: no
-
-Index: x2x-1.30/Makefile.am
-===================================================================
---- x2x-1.30.orig/Makefile.am	2013-02-02 05:50:53.000000000 -0700
-+++ x2x-1.30/Makefile.am	2013-02-02 05:53:47.745387175 -0700
-@@ -5,7 +5,7 @@
- #
- 
- AM_CFLAGS = $(X11_CFLAGS) -Wall
--AM_LDFLAGS = $(X11_LIBS)
-+LIBS = $(X11_LIBS)
- 
- bin_PROGRAMS = x2x
- 
-@@ -19,7 +19,7 @@
- if WIN32
- 
- AM_CFLAGS += -DWIN_2_X
--AM_LDFLAGS += -luser32 -lgdi32 # Ugly hack
-+LIBS += -luser32 -lgdi32 # Ugly hack
- x2x_SOURCES += keymap.c winmsg.c x2xwin.rc
- 
- .o:.rc
diff -Nru x2x-1.30/debian/patches/series x2x-1.30/debian/patches/series
--- x2x-1.30/debian/patches/series	2013-02-02 12:50:53.000000000 +0000
+++ x2x-1.30/debian/patches/series	2013-02-02 19:13:15.000000000 +0000
@@ -1 +1 @@
-ld-as-needed.patch
+debian-changes