diff --git a/MANIFEST.in b/MANIFEST.in
index e4377ef..0a7d521 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,3 +2,4 @@ include AUTHORS.txt CHANGES.txt LICENSE.txt README.rst
 global-include logconfig.ini
 recursive-include bin run_server.sh
 recursive-include kmip *.py
+include kmip/demos/certs/server.*
diff --git a/kmip/services/kmip_server.py b/kmip/services/kmip_server.py
index 08a863a..88973ce 100644
--- a/kmip/services/kmip_server.py
+++ b/kmip/services/kmip_server.py
@@ -81,10 +81,10 @@ class KMIPServer(object):
         self.port = int(conf.get_valid_value(port, 'server',
                                              'port', conf.DEFAULT_PORT))
         self.keyfile = conf.get_valid_value(
-            keyfile, 'server', 'keyfile', conf.DEFAULT_CERTFILE)
+            keyfile, 'server', 'keyfile', conf.DEFAULT_KEYFILE)
 
         self.certfile = conf.get_valid_value(
-            certfile, 'server', 'certfile', conf.DEFAULT_KEYFILE)
+            certfile, 'server', 'certfile', conf.DEFAULT_CERTFILE)
 
         self.cert_reqs = getattr(ssl, conf.get_valid_value(
             cert_reqs, 'server', 'cert_reqs', 'CERT_NONE'))
diff --git a/setup.py b/setup.py
index 6ad9fcc..eafb77e 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,8 @@ setuptools.setup(
     url='https://github.com/OpenKMIP/PyKMIP',
     license='Apache License, Version 2.0',
     packages=setuptools.find_packages(exclude=["kmip.tests", "kmip.tests.*"]),
-    package_data={'kmip': ['logconfig.ini']},
+    package_data={'kmip': ['logconfig.ini'],
+                  'kmip.demos': ['certs/server.crt', 'certs/server.key']},
     install_requires=[
         "enum34",
         "six",