diff --git a/CHANGELOG.md b/CHANGELOG.md
index e99004687..84e1d9bcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.5.1
+
+Fixes a bug in the `exclude-types` argument usage.
+
 ## 2.5.0
 
 Added a configuration option to remove `siteMapPriority` field globally
diff --git a/index.js b/index.js
index 17b936136..29124132d 100644
--- a/index.js
+++ b/index.js
@@ -69,10 +69,6 @@ module.exports = {
 
       var argv = self.apos.argv;
 
-      if (argv['exclude-types']) {
-        self.excludeTypes = excludeTypes.concat(argv['exclude-types'].split(','));
-      }
-
       if (self.caching) {
         self.cacheOutput = [];
       }
@@ -93,7 +89,13 @@ module.exports = {
         self.format = argv.format || options.format || 'xml';
 
         self.indent = (typeof(argv.indent) !== 'undefined') ? argv.indent : options.indent;
+
         self.excludeTypes = options.excludeTypes || [];
+
+        if (argv['exclude-types']) {
+          self.excludeTypes = self.excludeTypes.concat(argv['exclude-types'].split(','));
+        }
+
         self.perLocale = options.perLocale || argv['per-locale'];
         // Exception: plaintext sitemaps and sitemap indexes don't go
         // together, so we can presume that if they explicitly ask
diff --git a/package.json b/package.json
index 6d45427bc..b01c9e770 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apostrophe-site-map",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Generate site maps for sites powered by the Apostrophe CMS.",
   "main": "index.js",
   "dependencies": {
@@ -19,7 +19,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/punkave/apostrophe-site-map"
+    "url": "https://github.com/apostrophecms/apostrophe-site-map"
   },
   "keywords": [
     "sitemap",
@@ -33,7 +33,7 @@
   "author": "P'unk Avenue LLC",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/punkave/apostrophe-site-map/issues"
+    "url": "https://github.com/apostrophecms/apostrophe-site-map/issues"
   },
-  "homepage": "https://github.com/punkave/apostrophe-site-map"
+  "homepage": "https://github.com/apostrophecms/apostrophe-site-map"
 }