diff --git a/Dockerfile b/Dockerfile
index 600fdf78..c5bf9f13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM fedora:24
 
 # so we don't have to compile those when fetched from PyPI
-RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client && \
+RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client swig && \
     dnf autoremove -y && dnf clean all && \
     mkdir /opt/fm-orchestrator/
 WORKDIR /opt/fm-orchestrator/
diff --git a/Vagrantfile b/Vagrantfile
index bb10a555..786f05e5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 $script = <<SCRIPT
-    dnf install -y python python-virtualenv python-devel libffi-devel redhat-rpm-config openssl-devel gcc gcc-c++ koji git
+    dnf install -y python python-virtualenv python-devel libffi-devel redhat-rpm-config openssl-devel gcc gcc-c++ koji git swig
     pip install -r /opt/fm-orchestrator/src/requirements.txt
     pip install -r /opt/fm-orchestrator/src/test-requirements.txt
     cd /opt/fm-orchestrator/src
diff --git a/manage.py b/manage.py
index 616b2941..7a2f7e71 100644
--- a/manage.py
+++ b/manage.py
@@ -115,8 +115,8 @@ def gendevfedmsgcert(pki_dir='/opt/fm-orchestrator/pki', force=False):
 
     ca_crt_path = os.path.join(pki_dir, 'ca.crt')
     ca_key_path = os.path.join(pki_dir, 'ca.key')
-    msg_key_path = os.path.join(pki_dir, 'msg_signing.key')
-    msg_crt_path = os.path.join(pki_dir, 'msg_signing.crt')
+    msg_key_path = os.path.join(pki_dir, 'localhost.key')
+    msg_crt_path = os.path.join(pki_dir, 'localhost.crt')
     ca_crl = os.path.join(pki_dir, 'ca.crl')
 
     # Create a key pair for the CA
diff --git a/requirements.txt b/requirements.txt
index d0fc5f7a..a1ec17f8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,3 +12,5 @@ Flask-SQLAlchemy
 Flask-Migrate
 python-fedora
 funcsigs # Python2 only
+m2crypto
+m2ext