diff --git a/packages/addons/service/proftpd/changelog.txt b/packages/addons/service/proftpd/changelog.txt
index 927b2407d4..b1c35345a5 100644
--- a/packages/addons/service/proftpd/changelog.txt
+++ b/packages/addons/service/proftpd/changelog.txt
@@ -1 +1,4 @@
+1
+- convert HTML special entities in username and password
+
 initial release
diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk
index a5240f2178..fbea14cfac 100644
--- a/packages/addons/service/proftpd/package.mk
+++ b/packages/addons/service/proftpd/package.mk
@@ -5,7 +5,7 @@
 PKG_NAME="proftpd"
 PKG_VERSION="1.3.8b"
 PKG_SHA256="183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.proftpd.org/"
diff --git a/packages/addons/service/proftpd/source/bin/proftpd.start b/packages/addons/service/proftpd/source/bin/proftpd.start
index 6c12ef790a..de3f22563b 100755
--- a/packages/addons/service/proftpd/source/bin/proftpd.start
+++ b/packages/addons/service/proftpd/source/bin/proftpd.start
@@ -98,8 +98,8 @@ touch /var/config/proftpd.passwd
 chmod 700 /var/config/proftpd.passwd
 
 for NUM in $(seq 1 100); do
-  USERNAME=$(eval echo \$Username${NUM})
-  USERPASS=$(eval echo \$Userpass${NUM})
+  USERNAME=$(eval echo \$Username${NUM} | xmlstarlet unesc)
+  USERPASS=$(eval echo \$Userpass${NUM} | xmlstarlet unesc)
   USERPATH=$(eval echo \$Userpath${NUM})
 
   case "$CryptoHash" in