diff -Nru glusterfs-3.2.5/debian/changelog glusterfs-3.2.5/debian/changelog
--- glusterfs-3.2.5/debian/changelog	2012-01-07 13:21:09.000000000 +0000
+++ glusterfs-3.2.5/debian/changelog	2012-01-29 08:16:12.000000000 +0000
@@ -1,3 +1,10 @@
+glusterfs (3.2.5-1ubuntu1) precise; urgency=low
+
+  * Added Ubuntu upstart jobs providing support for local glusterfs mounts
+    (LP: #876648)
+
+ -- Louis Zuckerman <me@louiszuckerman.com>  Sat, 28 Jan 2012 15:32:55 -0500
+
 glusterfs (3.2.5-1) unstable; urgency=low
 
   [ Louis Zuckerman ]
diff -Nru glusterfs-3.2.5/debian/control glusterfs-3.2.5/debian/control
--- glusterfs-3.2.5/debian/control	2012-01-07 13:21:09.000000000 +0000
+++ glusterfs-3.2.5/debian/control	2012-01-29 16:07:37.000000000 +0000
@@ -1,7 +1,8 @@
 Source: glusterfs
 Section: admin
 Priority: optional
-Maintainer: Patrick Matthäi <pmatthaei@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Patrick Matthäi <pmatthaei@debian.org>
 Uploaders: Matthias Albert <matthias@linux4experts.de>,
 Build-Depends: cdbs (>= 0.4.90~),
  debhelper (>= 7),
diff -Nru glusterfs-3.2.5/debian/glusterfs-server.mounting-glusterfs.upstart glusterfs-3.2.5/debian/glusterfs-server.mounting-glusterfs.upstart
--- glusterfs-3.2.5/debian/glusterfs-server.mounting-glusterfs.upstart	1970-01-01 00:00:00.000000000 +0000
+++ glusterfs-3.2.5/debian/glusterfs-server.mounting-glusterfs.upstart	2012-01-29 16:07:37.000000000 +0000
@@ -0,0 +1,7 @@
+author "Louis Zuckerman <me@louiszuckerman.com>"
+description "Block the mounting event for glusterfs filesystems until glusterfs-server is running"
+
+start on mounting TYPE=glusterfs
+task
+exec start wait-for-state WAIT_FOR=glusterfs-server WAITER=mounting-glusterfs
+
diff -Nru glusterfs-3.2.5/debian/glusterfs-server.upstart glusterfs-3.2.5/debian/glusterfs-server.upstart
--- glusterfs-3.2.5/debian/glusterfs-server.upstart	1970-01-01 00:00:00.000000000 +0000
+++ glusterfs-3.2.5/debian/glusterfs-server.upstart	2012-01-29 08:16:12.000000000 +0000
@@ -0,0 +1,10 @@
+author "Louis Zuckerman <me@louiszuckerman.com>"
+description "GlusterFS Management Daemon"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+expect fork
+
+exec /usr/sbin/glusterd -p /var/run/glusterd.pid
+
diff -Nru glusterfs-3.2.5/debian/rules glusterfs-3.2.5/debian/rules
--- glusterfs-3.2.5/debian/rules	2012-01-07 13:21:09.000000000 +0000
+++ glusterfs-3.2.5/debian/rules	2012-01-29 08:16:12.000000000 +0000
@@ -24,6 +24,9 @@
 	rm -f debian/tmp/usr/lib/glusterfs/glusterfs/python/syncdaemon/*.pyc
 	rm -f debian/tmp/usr/lib/glusterfs/glusterfs/python/syncdaemon/*.pyo
 
+binary-install/glusterfs-server::
+	dh_installinit -pglusterfs-server --upstart-only --no-start --name mounting-glusterfs
+
 clean::
 	dh $@