diff -u opencryptoki-2.2.5+dfsg/debian/libopencryptoki0.install opencryptoki-2.2.5+dfsg/debian/libopencryptoki0.install
--- opencryptoki-2.2.5+dfsg/debian/libopencryptoki0.install
+++ opencryptoki-2.2.5+dfsg/debian/libopencryptoki0.install
@@ -2,4 +2,5 @@
 /usr/lib/opencryptoki/*.so.*
 /usr/lib/opencryptoki/methods
+/usr/lib/opencryptoki/stdll/*.so.*
 /usr/lib/pkcs11/methods
 /usr/lib/pkcs11/stdll
diff -u opencryptoki-2.2.5+dfsg/debian/libopencryptoki-dev.install opencryptoki-2.2.5+dfsg/debian/libopencryptoki-dev.install
--- opencryptoki-2.2.5+dfsg/debian/libopencryptoki-dev.install
+++ opencryptoki-2.2.5+dfsg/debian/libopencryptoki-dev.install
@@ -3,2 +3,4 @@
 /usr/lib/opencryptoki/*.so
+/usr/lib/opencryptoki/stdll/*.la
+/usr/lib/opencryptoki/stdll/*.so
 /usr/lib/pkcs11/*.so
diff -u opencryptoki-2.2.5+dfsg/debian/changelog opencryptoki-2.2.5+dfsg/debian/changelog
--- opencryptoki-2.2.5+dfsg/debian/changelog
+++ opencryptoki-2.2.5+dfsg/debian/changelog
@@ -1,3 +1,11 @@
+opencryptoki (2.2.5+dfsg-1ubuntu2) hardy-proposed; urgency=low
+
+  * Revert changes from 2.2.5+dfsg-1ubuntu1 (install stdll files again).
+    LP: #198618.
+  * Update maintainer field.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com>  Thu, 29 May 2008 19:00:51 +0200
+
 opencryptoki (2.2.5+dfsg-1ubuntu1) hardy; urgency=low
 
   * Merge from debian unstable
diff -u opencryptoki-2.2.5+dfsg/debian/control opencryptoki-2.2.5+dfsg/debian/control
--- opencryptoki-2.2.5+dfsg/debian/control
+++ opencryptoki-2.2.5+dfsg/debian/control
@@ -1,7 +1,8 @@
 Source: opencryptoki
 Section: admin
 Priority: optional
-Maintainer: Daniel Baumann <daniel@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libtspi-dev, automake
 Standards-Version: 3.7.3
 Homepage: http://opencryptoki.sourceforge.net/