diff -u smarty-2.6.19/debian/control smarty-2.6.19/debian/control
--- smarty-2.6.19/debian/control
+++ smarty-2.6.19/debian/control
@@ -1,7 +1,8 @@
 Source: smarty
 Section: web
 Priority: optional
-Maintainer: Dimitri Fontaine <dim@tapoueh.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Dimitri Fontaine <dim@tapoueh.org>
 Uploaders: Igor Genibel <igenibel@debian.org>, Pierre Machard <pmachard@debian.org>, Thierry Randrianiriana <randrianiriana@gmail.com>
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5)
diff -u smarty-2.6.19/debian/Makefile smarty-2.6.19/debian/Makefile
--- smarty-2.6.19/debian/Makefile
+++ smarty-2.6.19/debian/Makefile
@@ -10,13 +10,13 @@
 TOPFILES  = BUGS ChangeLog FAQ NEWS README RELEASE_NOTES TODO QUICK_START
 
 install:
-	install -d -o www-data -m 755 $(TARGETDIR)/libs
-	install -d -o www-data -m 755 $(TARGETDIR)/libs/internals
-	install -d -o www-data -m 755 $(TARGETDIR)/libs/plugins
+	install -d -o www-data -m 755 $(TARGETDIR)/
+	install -d -o www-data -m 755 $(TARGETDIR)/internals
+	install -d -o www-data -m 755 $(TARGETDIR)/plugins
 
-	install -o www-data -m 644 $(LIBS)      $(TARGETDIR)/libs
-	install -o www-data -m 644 $(INTERNALS) $(TARGETDIR)/libs/internals
-	install -o www-data -m 644 $(PLUGINS)   $(TARGETDIR)/libs/plugins
+	install -o www-data -m 644 $(LIBS)      $(TARGETDIR)/
+	install -o www-data -m 644 $(INTERNALS) $(TARGETDIR)/internals
+	install -o www-data -m 644 $(PLUGINS)   $(TARGETDIR)/plugins
 
 	install -m 644 debian/lintian-override $(DESTDIR)/usr/share/lintian/overrides/smarty
 
diff -u smarty-2.6.19/debian/README.Debian smarty-2.6.19/debian/README.Debian
--- smarty-2.6.19/debian/README.Debian
+++ smarty-2.6.19/debian/README.Debian
@@ -1,8 +1,9 @@
 Installation
 
 In order to use Smarty from your php scripts, you'll have to add
-/usr/share/php/smarty/libs on the include_path of php4, that is in the
-file /etc/php4/apache/php.ini
+/usr/share/php/smarty on the include_path of php4/php5, that is in the
+file /etc/{php4,php5}/{apache,apache2}/php.ini or use
+require("smarty/Smarty.class.php");
 
 
 Update
diff -u smarty-2.6.19/debian/changelog smarty-2.6.19/debian/changelog
--- smarty-2.6.19/debian/changelog
+++ smarty-2.6.19/debian/changelog
@@ -1,3 +1,11 @@
+smarty (2.6.19-1ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, Ubuntu remaning changes: (LP: #226864)
+  + debian/Makefile: path fixed.
+  + Updated README.Debian to match path changes. 
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Mon, 05 May 2008 13:55:05 +0200
+
 smarty (2.6.19-1) unstable; urgency=low
 
   * New upstream release
@@ -20,6 +28,33 @@
 
  -- Nico Golde <nion@debian.org>  Sat, 15 Mar 2008 15:10:58 +0100
 
+smarty (2.6.18-1ubuntu3) hardy; urgency=low
+
+  * SECURITY UPDATE: (LP: #202422)
+   + libs/plugins/modifier.regex_replace.php
+    - The modifier.regex_replace.php plugin in Smarty before 2.6.19, as used
+      by Serendipity (S9Y) and other products, allows attackers to call arbitrary
+      PHP functions via templates, related to a '\0' character in a search string.
+
+  * References
+   + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1066
+   + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469492
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Sat, 15 Mar 2008 06:54:31 +0100
+
+smarty (2.6.18-1ubuntu2) gutsy; urgency=low
+
+  * Updated README.Debian to match path changes
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Tue, 12 Jun 2007 10:48:47 +0900
+
+smarty (2.6.18-1ubuntu1) gutsy; urgency=low
+
+  * Set Maintainer to Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+  * Modified Makefile so libs will be installed to correct directory (LP: #118793)
+
+ -- Nathan Handler <mrcheatr@gmail.com>  Sat, 09 Jun 2007 08:20:06 -0500
+
 smarty (2.6.18-1) unstable; urgency=low
 
   * New upstream release
@@ -171,0 +207 @@
+