diff -u vsftpd-2.2.2/debian/changelog vsftpd-2.2.2/debian/changelog
--- vsftpd-2.2.2/debian/changelog
+++ vsftpd-2.2.2/debian/changelog
@@ -1,3 +1,16 @@
+vsftpd (2.2.2-3ubuntu6.1) lucid-proposed; urgency=low
+
+  * debian/vsftpd.upstart:
+    - Fix typo. Thanks to Jürgen Kreileder (LP: #577165)
+    - Fix start of vsftpd even if not in standalone mode. Thanks to
+      Stephane Chazelas (LP: #648202)
+
+  [ Dustin Kirkland, Serge Hallyn ]
+  * debian/vsftpd.postinst: Check that the group exists first, then the user,
+    then try adding the user to the group. (LP: #629234, LP: #677764)
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Fri, 25 Feb 2011 16:31:20 -0500
+
 vsftpd (2.2.2-3ubuntu6) lucid; urgency=low
 
   * debian/vsftpd.upstart: Update upstart job. (LP: #563973) 
diff -u vsftpd-2.2.2/debian/vsftpd.postinst vsftpd-2.2.2/debian/vsftpd.postinst
--- vsftpd-2.2.2/debian/vsftpd.postinst
+++ vsftpd-2.2.2/debian/vsftpd.postinst
@@ -16,16 +16,19 @@
 
 		db_stop
 
-		if ! getent passwd | grep -q "^${_USERNAME}"
-		then
-			adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME}
-		elif ! getent group | grep -q "^${_USERNAME}"
+		if ! getent group | grep -q "^${_USERNAME}:"
 		then
 			addgroup --system --quiet ${_USERNAME}
-			gpasswd -a ${_USERNAME} ${_USERNAME}
+		else
+			echo "vsftpd group (${_USERNAME}) already exists, doing nothing."
+		fi
+		if ! getent passwd | grep -q "^${_USERNAME}:"
+		then
+			adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME}
 		else
 			echo "vsftpd user (${_USERNAME}) already exists, doing nothing."
 		fi
+		gpasswd -a ${_USERNAME} ${_USERNAME}
 
 		if [ ! -d "${_DIRECTORY}" ]
 		then
diff -u vsftpd-2.2.2/debian/vsftpd.upstart vsftpd-2.2.2/debian/vsftpd.upstart
--- vsftpd-2.2.2/debian/vsftpd.upstart
+++ vsftpd-2.2.2/debian/vsftpd.upstart
@@ -15,15 +15,15 @@
 		# Return 1 if vsftpd.conf doesn't have listen yes or listen_ipv6=yes
 		CONFFILE="/etc/vsftpd.conf"
 
-		if [ -e  "${CONFFILE}" ] && !egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
+		if [ -e  "${CONFFILE}" ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
 		then
 			echo "${CONFFILE}: listen disabled - service will not start"
 			return 1
 		fi 
 	}
 	[ -d /var/run/vsftpd ] || install -m 755 -o root -g root -d /var/run/vsftpd
-	[ -d /var/run/vsftpd/emply ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty
-	check_standalone_mode || exit 0
+	[ -d /var/run/vsftpd/empty ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty
+	check_standalone_mode || stop
 end script
 
 exec /usr/sbin/vsftpd