diff -Nru linux-ftpd-ssl-0.17.35+0.3/debian/changelog linux-ftpd-ssl-0.17.35+0.3/debian/changelog
--- linux-ftpd-ssl-0.17.35+0.3/debian/changelog	2015-04-27 13:29:35.000000000 +0000
+++ linux-ftpd-ssl-0.17.35+0.3/debian/changelog	2015-06-11 17:27:33.000000000 +0000
@@ -1,3 +1,10 @@
+linux-ftpd-ssl (0.17.35+0.3-2) unstable; urgency=medium
+
+  * NLST of empty directory results in segfault.
+    + debian/patches/500-ssl.diff: Updated. (Closes: #788331)
+
+ -- Mats Erik Andersson <mats.andersson@gisladisker.se>  Thu, 11 Jun 2015 19:25:49 +0200
+
 linux-ftpd-ssl (0.17.35+0.3-1) unstable; urgency=low
 
   * Update to source version 0.17-35 of linux-ftpd.
diff -Nru linux-ftpd-ssl-0.17.35+0.3/debian/patches/500-ssl.diff linux-ftpd-ssl-0.17.35+0.3/debian/patches/500-ssl.diff
--- linux-ftpd-ssl-0.17.35+0.3/debian/patches/500-ssl.diff	2015-04-27 12:58:05.000000000 +0000
+++ linux-ftpd-ssl-0.17.35+0.3/debian/patches/500-ssl.diff	2015-06-10 22:24:13.000000000 +0000
@@ -3,7 +3,7 @@
 Origin: ftp://ftp.uni-mainz.de/pub/software/security/ssl/SSL-MZapps/linux-ftpd-0.17+ssl-0.3.diff.gz
 Forwarded: not-needed
 Author: Tim Hudson <tjh@cryptsoft.com>
-Last-Update: 2010-06-21
+Last-Update: 2015-06-11
 
 Index: linux-ftpd-ssl/ftpd/Makefile
 ===================================================================
@@ -917,10 +917,12 @@
  				byte_count += strlen(nbuf) + 1;
  			}
  		}
-@@ -2705,6 +3193,13 @@
+@@ -2704,8 +3193,16 @@
+ 		reply(226, "Transfer complete.");
  
  	transflag = 0;
- 	if (dout != NULL)
+-	if (dout != NULL)
++	if (dout != NULL) {
 +#ifdef USE_SSL
 +                if (ssl_data_active_flag && (ssl_data_con!=NULL)) {
 +		    SSL_free(ssl_data_con);
@@ -929,8 +931,10 @@
 +		}
 +#endif /* USE_SSL */
  		(void) fclose(dout);
++	}
  	data = -1;
  	pdata = -1;
+ out:
 @@ -2792,3 +3287,223 @@
  }
  #endif	/* TCPWRAPPERS */