diff --git a/CHANGES b/CHANGES
index aef80a6a3df6cf41b53ba01e915bf45ebe4237d9..fac2eb3bce8533b3cbdab0e5262a69989e9d22bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.2.1 2020-01-04
+ - Fix expand option not to fail if files are missing since socket activation
+   service files are not shipped in the sdist
+ - Correct dkimpy-milter.conf file install location to match expand locations
+
 1.2.0 2020-01-03
  - Add support for SigningTable, KeyTable, and KeyTableEd25519 (LP: #1797397)
  - Add support for specifying MinimumKeyBits for RSA signatures
diff --git a/PKG-INFO b/PKG-INFO
index 73ff5c203933acfb580b8674f04fb0a07bddd9a8..917e8491e54d6201841f514cee94bd6de8a109db 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkimpy-milter
-Version: 1.2.0
+Version: 1.2.1
 Summary: Domain Keys Identified Mail (DKIM) signing/verifying milter for Postfix/Sendmail.
 Home-page: https://launchpad.net/dkimpy-milter
 Author: Scott Kitterman
diff --git a/dkimpy_milter.egg-info/PKG-INFO b/dkimpy_milter.egg-info/PKG-INFO
index 73ff5c203933acfb580b8674f04fb0a07bddd9a8..917e8491e54d6201841f514cee94bd6de8a109db 100644
--- a/dkimpy_milter.egg-info/PKG-INFO
+++ b/dkimpy_milter.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkimpy-milter
-Version: 1.2.0
+Version: 1.2.1
 Summary: Domain Keys Identified Mail (DKIM) signing/verifying milter for Postfix/Sendmail.
 Home-page: https://launchpad.net/dkimpy-milter
 Author: Scott Kitterman
diff --git a/setup.py b/setup.py
index 913cf5657acb208f80ec3ec46cdec85409b1773a..07039f71ddd28d32fa3df47cd258e19306d25cdc 100644
--- a/setup.py
+++ b/setup.py
@@ -53,29 +53,32 @@ class FileMacroExpand(distutils.cmd.Command):
                  'system/dkimpy-milter.service', 'system/dkimpy-milter', \
                  'system/dkimpy-milter.openrc', \
                  'system/socket-activation/dkimpy-milter.service', \
-                 'system/socket-activation/dkimpy-milter.socket',]
+                 'system/socket-activation/dkimpy-milter.socket', ]
         for infile in files:
             outfile = ''
-            filein = open(infile + '.in')
-            for line in filein:
-                for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@"]:
-                    splitline = line.split(function)
-                    if len(splitline) > 1:
-                        if function == "@SYSCONFDIR@":
-                            line = splitline[0] + self.sysconfigdir + splitline[1]
-                        elif function == "@CONFDIR@":
-                            line = splitline[0] + self.configdir + splitline[1]
-                        elif function == "@SBINDIR@":
-                            line = splitline[0] + self.sbindir + splitline[1]
-                        elif function == "@BINDIR@":
-                            line = splitline[0] + self.bindir + splitline[1]
-                        elif function == "@RUNSTATEDIR@":
-                            line = splitline[0] + self.rundir + splitline[1]
-                outfile += line
-            out = open(infile, 'w')
-            for line in outfile:
-                out.write(line)
-            out.close()
+            try:
+                filein = open(infile + '.in')
+                for line in filein:
+                    for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@"]:
+                        splitline = line.split(function)
+                        if len(splitline) > 1:
+                            if function == "@SYSCONFDIR@":
+                                line = splitline[0] + self.sysconfigdir + splitline[1]
+                            elif function == "@CONFDIR@":
+                                line = splitline[0] + self.configdir + splitline[1]
+                            elif function == "@SBINDIR@":
+                                line = splitline[0] + self.sbindir + splitline[1]
+                            elif function == "@BINDIR@":
+                                line = splitline[0] + self.bindir + splitline[1]
+                            elif function == "@RUNSTATEDIR@":
+                                line = splitline[0] + self.rundir + splitline[1]
+                    outfile += line
+                out = open(infile, 'w')
+                for line in outfile:
+                    out.write(line)
+                out.close()
+            except FileNotFoundError as x:
+                pass
 
 kw = {}  # Work-around for lack of 'or' requires in setuptools.
 try:
@@ -86,7 +89,7 @@ except ImportError:  # If PyDNS is not installed, prefer dnspython
 
 setup(
     name='dkimpy-milter',
-    version='1.2.0',
+    version='1.2.1',
     author='Scott Kitterman',
     author_email='scott@kitterman.com',
     url='https://launchpad.net/dkimpy-milter',
@@ -115,8 +118,8 @@ setup(
     include_package_data=True,
     data_files=[(os.path.join('share', 'man', 'man5'),
         ['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'),
-        ['man/dkimpy-milter.8']), ('etc', ['etc/dkimpy-milter.conf']),
-        (os.path.join('lib', 'systemd', 'system'),
+        ['man/dkimpy-milter.8']), (os.path.join('etc', 'dkimpy-milter'),
+        ['etc/dkimpy-milter.conf']), (os.path.join('lib', 'systemd', 'system'),
         ['system/dkimpy-milter.service']),(os.path.join('etc', 'init.d'),
         ['system/dkimpy-milter']), (os.path.join('etc', 'init.d'),
         ['system/dkimpy-milter.openrc'])],