diff --git a/Changes b/Changes
index 0335629c4..7177599f9 100644
--- a/Changes
+++ b/Changes
@@ -1811,3 +1811,5 @@ MOTDs
   fds and cause problems, so its a heads up
 - Some minor changes to unreal.in, to fix unreal stop, start, and 
   restart a bit.
+- #0003396 reported and patched by Bock regarding not copying server.*.pem
+  on "make install" 
diff --git a/Makefile.in b/Makefile.in
index 1f4c1caf4..17cdc5114 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,6 +229,11 @@ install: all
 	-@if [ ! -f "$(IRCDDIR)/curl-ca-bundle.crt" ] ; then \
 		$(INSTALL) -m 0700 curl-ca-bundle.crt $(IRCDDIR) ; \
 	fi
+	-@if [ -f server.key.pem ] ; then \
+		if [ ! -f "$(IRCDDIR)/server.key.pem" ] ; then \
+		$(INSTALL) -m 0600 server.*.pem $(IRCDDIR) ; \
+		fi ; \
+	fi
 
 pem:	src/ssl.cnf
 	@echo "Generating certificate request .. "