diff -Naur proftpd-1.3.3/sample-configurations/anonymous.conf proftpd-1.3.3-magellan/sample-configurations/anonymous.conf
--- proftpd-1.3.3/sample-configurations/anonymous.conf	2010-03-04 14:21:43.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/anonymous.conf	2010-03-04 14:24:11.000000000 +0100
@@ -56,15 +56,13 @@
 # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd
 #
 # Generate the certificate as follows:
-# openssl req -new -x509 -days 365 -nodes  \
-#		-out /etc/ssl/certs/proftpd.cert.pem \
-#		-keyout /etc/ssl/certs/proftpd.key.pem
+# 	openssl-make-cert proftpd
 #
 <IfDefine TLS>
   TLSEngine			on
   TLSRequired			on
-  TLSRSACertificateFile		/etc/ssl/certs/proftpd.cert.pem
-  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.key.pem
+  TLSRSACertificateFile		/etc/ssl/certs/proftpd.pem
+  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.pem
   TLSCipherSuite		ALL:!ADH:!DES
   TLSOptions			NoCertRequest
   TLSVerifyClient		off
diff -Naur proftpd-1.3.3/sample-configurations/basic.conf proftpd-1.3.3-magellan/sample-configurations/basic.conf
--- proftpd-1.3.3/sample-configurations/basic.conf	2010-03-04 14:21:43.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/basic.conf	2010-03-04 14:24:52.000000000 +0100
@@ -57,15 +57,13 @@
 # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd
 #
 # Generate the certificate as follows:
-# openssl req -new -x509 -days 365 -nodes  \
-#		-out /etc/ssl/certs/proftpd.cert.pem \
-#		-keyout /etc/ssl/certs/proftpd.key.pem
+#       openssl-make-cert proftpd
 #
 <IfDefine TLS>
   TLSEngine			on
   TLSRequired			on
-  TLSRSACertificateFile		/etc/ssl/certs/proftpd.cert.pem
-  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.key.pem
+  TLSRSACertificateFile		/etc/ssl/certs/proftpd.pem
+  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.pem
   TLSCipherSuite		ALL:!ADH:!DES
   TLSOptions			NoCertRequest
   TLSVerifyClient		off
diff -Naur proftpd-1.3.3/sample-configurations/mod_sql.conf proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf
--- proftpd-1.3.3/sample-configurations/mod_sql.conf	2010-03-04 14:21:43.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf	2010-03-04 14:25:13.000000000 +0100
@@ -87,15 +87,13 @@
 # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd
 #
 # Generate the certificate as follows:
-# openssl req -new -x509 -days 365 -nodes  \
-#		-out /etc/ssl/certs/proftpd.cert.pem \
-#		-keyout /etc/ssl/certs/proftpd.key.pem
+#       openssl-make-cert proftpd
 #
 <IfDefine TLS>
   TLSEngine			on
   TLSRequired			on
-  TLSRSACertificateFile		/etc/ssl/certs/proftpd.cert.pem
-  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.key.pem
+  TLSRSACertificateFile		/etc/ssl/certs/proftpd.pem
+  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.pem
   TLSCipherSuite		ALL:!ADH:!DES
   TLSOptions			NoCertRequest
   TLSVerifyClient		off
diff -Naur proftpd-1.3.3/sample-configurations/virtual.conf proftpd-1.3.3-magellan/sample-configurations/virtual.conf
--- proftpd-1.3.3/sample-configurations/virtual.conf	2010-03-04 14:21:43.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/virtual.conf	2010-03-04 14:25:54.000000000 +0100
@@ -52,15 +52,13 @@
 # Enable this with PROFTPD_OPTIONS=-DTLS in /etc/conf.d/proftpd
 #
 # Generate the certificate as follows:
-# openssl req -new -x509 -days 365 -nodes  \
-#		-out /etc/ssl/certs/proftpd.cert.pem \
-#		-keyout /etc/ssl/certs/proftpd.key.pem
+#       openssl-make-cert proftpd
 #
 <IfDefine TLS>
   TLSEngine			on
   TLSRequired			on
-  TLSRSACertificateFile		/etc/ssl/certs/proftpd.cert.pem
-  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.key.pem
+  TLSRSACertificateFile		/etc/ssl/certs/proftpd.pem
+  TLSRSACertificateKeyFile	/etc/ssl/certs/proftpd.pem
   TLSCipherSuite		ALL:!ADH:!DES
   TLSOptions			NoCertRequest
   TLSVerifyClient		off