diff --git a/bin/autojump b/bin/autojump
index e7b061d..9593ead 100755
--- a/bin/autojump
+++ b/bin/autojump
@@ -65,7 +65,7 @@ from autojump_utils import sanitize
 from autojump_utils import take
 from autojump_utils import unico
 
-VERSION = '22.5.1'
+VERSION = '22.5.2'
 FUZZY_MATCH_THRESHOLD = 0.6
 TAB_ENTRIES_COUNT = 9
 TAB_SEPARATOR = '__'
diff --git a/bin/autojump_data.py b/bin/autojump_data.py
index 2ba7fbb..d647a42 100644
--- a/bin/autojump_data.py
+++ b/bin/autojump_data.py
@@ -120,11 +120,12 @@ def migrate_osx_xdg_data(config):
 
 def save(config, data):
     """Save data and create backup, creating a new data file if necessary."""
-    create_dir(os.path.dirname(config['data_path']))
+    data_dir = os.path.dirname(config['data_path'])
+    create_dir(data_dir)
 
     # atomically save by writing to temporary file and moving to destination
     try:
-        temp = NamedTemporaryFile(delete=False)
+        temp = NamedTemporaryFile(delete=False, dir=data_dir)
         # Windows cannot reuse the same open file name
         temp.close()
 
diff --git a/docs/autojump.1 b/docs/autojump.1
index 40af970..af585ee 100644
--- a/docs/autojump.1
+++ b/docs/autojump.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 1.16.0.2
 .\"
-.TH "autojump" "1" "2018\-09\-06" "release\-v22.5.1" ""
+.TH "autojump" "1" "2018\-09\-07" "release\-v22.5.2" ""
 .hy
 .SS NAME
 .PP
diff --git a/docs/manpage_header.md b/docs/manpage_header.md
index 7765d4a..e01f03e 100644
--- a/docs/manpage_header.md
+++ b/docs/manpage_header.md
@@ -1,3 +1,3 @@
-% autojump(1) release-v22.5.1
+% autojump(1) release-v22.5.2
 %
-% 2018-09-06
+% 2018-09-07