diff --git a/bin/git-changelog b/bin/git-changelog
index 539914b..dd246e2 100755
--- a/bin/git-changelog
+++ b/bin/git-changelog
@@ -47,10 +47,10 @@ if test "$CHANGELOG" = ""; then
     CHANGELOG='History.md';
   fi
 fi
-tmp="/tmp/changelog"
+tmp=`mktemp -t $(basename $0)`
 printf "$HEAD" > $tmp
 git-changelog $GIT_LOG_OPTS --list >> $tmp
 printf '\n' >> $tmp
 if [ -f $CHANGELOG ]; then cat $CHANGELOG >> $tmp; fi
-mv $tmp $CHANGELOG
+mv -f $tmp $CHANGELOG
 test -n "$EDITOR" && $EDITOR $CHANGELOG
diff --git a/bin/git-effort b/bin/git-effort
index 6258649..6da4f79 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-tmp="/tmp/.$(basename $0).$$"
+tmp=`mktemp -t $(basename $0)`
 above='0'
 color=
 
diff --git a/bin/git-rebase-patch b/bin/git-rebase-patch
index 9e19e72..6e7681e 100755
--- a/bin/git-rebase-patch
+++ b/bin/git-rebase-patch
@@ -15,7 +15,7 @@ then
 fi
 
 # Use a temporary index.
-index="/tmp/$(basename $0).$$.tmp"
+index=`mktemp -t $(basename $0)`
 cleanup() {
         rm $index
         exit 2