diff -u erlang-11.b.5dfsg/debian/changelog erlang-11.b.5dfsg/debian/changelog
--- erlang-11.b.5dfsg/debian/changelog
+++ erlang-11.b.5dfsg/debian/changelog
@@ -1,3 +1,11 @@
+erlang (1:11.b.5dfsg-8ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/rules: Add -fno-stack-protector to fix broken crypto_drv.
+    - Update maintainer field in debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Fri, 02 Nov 2007 19:24:10 +0100
+
 erlang (1:11.b.5dfsg-8) unstable; urgency=low
 
   * Added alternative dependency of erlang-base and erlang-base-hipe on hurd
@@ -75,6 +83,14 @@
 
  -- Sergei Golovan <sgolovan@debian.org>  Sun, 26 Aug 2007 21:53:10 +0400
 
+erlang (1:11.b.5dfsg-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/rules: Add -fno-stack-protector to fix broken crypto_drv.
+    - Update maintainer field in debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Sat, 04 Aug 2007 05:53:06 +0200
+
 erlang (1:11.b.5dfsg-2) unstable; urgency=low
 
   [ Sergei Golovan ]
@@ -83,6 +99,14 @@
 
  -- Torsten Werner <twerner@debian.org>  Thu, 02 Aug 2007 13:01:22 +0400
 
+erlang (1:11.b.5dfsg-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/rules: Add -fno-stack-protector to fix broken crypto_drv.
+    - Update maintainer field in debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Mon, 30 Jul 2007 13:50:39 +0200
+
 erlang (1:11.b.5dfsg-1) unstable; urgency=low
 
   [ Sergei Golovan ]
@@ -104,6 +128,14 @@
 
  -- Torsten Werner <twerner@debian.org>  Tue, 26 Jun 2007 17:49:41 +0400
 
+erlang (1:11.b.4-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/rules: Add -fno-stack-protector to fix broken crypto_drv.
+    - Update maintainer in field debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Sat, 30 Jun 2007 23:22:01 +0200
+
 erlang (1:11.b.4-4) unstable; urgency=low
 
   [ Sergei Golovan ]
@@ -135,6 +167,14 @@
 
  -- Torsten Werner <twerner@debian.org>  Fri, 18 May 2007 09:32:00 +0400
 
+erlang (1:11.b.4-2ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian Unstable. Remaining changes:
+    - Add -fno-stack-protector to fix broken crypto_drv.
+  * DebianMaintainerField update.
+
+ -- Soren Hansen <sh@linux2go.dk>  Tue, 01 May 2007 16:57:10 +0200
+
 erlang (1:11.b.4-2) unstable; urgency=low
 
   [ Sergei Golovan ]
@@ -177,6 +217,12 @@
 
  -- Torsten Werner <twerner@debian.org>  Fri, 09 Feb 2007 20:44:55 +0300
 
+erlang (1:11.b.2-4ubuntu1) feisty; urgency=low
+
+  * Fixed crypto_drv not working (Closes: Malone #68163)
+
+ -- Martin Jürgens <martin@gamesplace.info>  Mon, 22 Jan 2007 19:55:41 +0100
+
 erlang (1:11.b.2-4) unstable; urgency=medium
 
   [ Sergei Golovan ]
diff -u erlang-11.b.5dfsg/debian/rules erlang-11.b.5dfsg/debian/rules
--- erlang-11.b.5dfsg/debian/rules
+++ erlang-11.b.5dfsg/debian/rules
@@ -43,7 +43,7 @@
 CLOCK_GETTIME_OPT=--enable-clock-gettime
 endif
 
-CFLAGS=-g -O2
+CFLAGS=-g -O2 -fno-stack-protector
 GEN_OPT_FLGS = -O2
 
 unpatch: patch-stamp
diff -u erlang-11.b.5dfsg/debian/control erlang-11.b.5dfsg/debian/control
--- erlang-11.b.5dfsg/debian/control
+++ erlang-11.b.5dfsg/debian/control
@@ -1,5 +1,6 @@
 Source: erlang
-Maintainer: Erlang Packagers <erlang-pkg-devel@lists.berlios.de>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Erlang Packagers <erlang-pkg-devel@lists.berlios.de>
 Uploaders: Torsten Werner <twerner@debian.org>, Sergei Golovan <sgolovan@debian.org>
 Section: interpreters
 Priority: optional