diff -Nru tomcat6-6.0.35/debian/changelog tomcat6-6.0.35/debian/changelog
--- tomcat6-6.0.35/debian/changelog	2012-03-16 14:36:06.000000000 +0000
+++ tomcat6-6.0.35/debian/changelog	2012-04-11 09:46:17.000000000 +0000
@@ -1,3 +1,12 @@
+tomcat6 (6.0.35-1ubuntu3) precise; urgency=low
+
+  * Handle creation of user instances with pathnames containing spaces 
+    (LP: #977498):
+    - d/tomcat6-instance-create: Quote access to files and directories
+      so that spaces can be used when creating user instances.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 11 Apr 2012 10:29:11 +0100
+
 tomcat6 (6.0.35-1ubuntu2) precise; urgency=low
 
   * init: Make NAME dynamic, to allow starting multiple instances.
diff -Nru tomcat6-6.0.35/debian/tomcat6-instance-create tomcat6-6.0.35/debian/tomcat6-instance-create
--- tomcat6-6.0.35/debian/tomcat6-instance-create	2011-12-13 06:47:05.000000000 +0000
+++ tomcat6-6.0.35/debian/tomcat6-instance-create	2012-04-11 09:29:07.000000000 +0000
@@ -117,38 +117,38 @@
   read answer
 fi
 
-mkdir -p ${TARGET}
+mkdir -p "${TARGET}"
 
-FULLTARGET=`cd ${TARGET} > /dev/null && pwd`
+FULLTARGET=`cd "${TARGET}" > /dev/null && pwd`
 
-mkdir ${TARGET}/conf
-mkdir ${TARGET}/logs
-mkdir ${TARGET}/webapps
-mkdir ${TARGET}/work
-mkdir ${TARGET}/temp
-cp -r /usr/share/tomcat6/skel/* ${TARGET}
+mkdir "${TARGET}/conf"
+mkdir "${TARGET}/logs"
+mkdir "${TARGET}/webapps"
+mkdir "${TARGET}/work"
+mkdir "${TARGET}/temp"
+cp -r /usr/share/tomcat6/skel/* "${TARGET}"
 
 # Create necessary symbolic links so that eclipse can be properly configured
-ln -s /usr/share/tomcat6/lib ${TARGET}/lib
-ln -s /usr/share/tomcat6/bin/bootstrap.jar ${TARGET}/bin/bootstrap.jar
+ln -s /usr/share/tomcat6/lib "${TARGET}/lib"
+ln -s /usr/share/tomcat6/bin/bootstrap.jar "${TARGET}/bin/bootstrap.jar"
 
-sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" ${TARGET}/conf/server.xml
+sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
 
-cat > ${TARGET}/bin/startup.sh << EOT
+cat > "${TARGET}/bin/startup.sh" << EOT
 #!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE="${FULLTARGET}"
 /usr/share/tomcat6/bin/startup.sh
 echo "Tomcat started"
 EOT
 
-cat > ${TARGET}/bin/shutdown.sh << EOT
+cat > "${TARGET}/bin/shutdown.sh" << EOT
 #!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE="${FULLTARGET}"
 /usr/share/tomcat6/bin/shutdown.sh
 echo "Tomcat stopped"
 EOT
 
-chmod a+x ${TARGET}/bin/startup.sh ${TARGET}/bin/shutdown.sh
+chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh"
 echo "* New Tomcat instance created in ${TARGET}"
 echo "* You might want to edit default configuration in ${TARGET}/conf"
 echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance"