diff --git a/scripts/github-remove b/scripts/github-remove
index 7cfcd62da1..36643fc466 100755
--- a/scripts/github-remove
+++ b/scripts/github-remove
@@ -1,28 +1,60 @@
-#!/bin/sh
+#! /usr/bin/env python
+import argparse, datetime, sys
+from subprocess import call, check_output
+from os.path import dirname, abspath
 
-LIBRENMS_DIR=`dirname "$(readlink -f "$0/..")"`
-cd $LIBRENMS_DIR
+raw_input = getattr(__builtins__, 'raw_input', input)
 
-if [ "$1" == "-d" ]; then
-    # removing all uncommited changes
-    # git status
-    read -p "Are you sure you want to delete your changes? " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-        exit 1
-    fi
+def confirm(question):
+    valid = {"yes":True, "y":True, "ye":True, "no":False, "n":False}
+    while 1:
+        sys.stdout.write(question + " [y/N] ")
+        choice = raw_input().lower()
+        if choice == '':
+            return False
+        elif choice in valid.keys():
+            return valid[choice]
+        else:
+            sys.stdout.write("Please respond with 'yes' or 'no'  (or 'y' or 'n').\n")
 
-    git reset
-    git checkout --progress
-    git clean -d -f contrib/ doc/ html/ includes/ lib/ LibreNMS/ licenses/ mibs/ misc/ scripts/ sql-schema/ tests/
-    if [ "$2" == "-v" ]; then
-        git clean -x -d -f vendor/
-    fi
-elif [ "$1" == "-h" ]; then
-    echo "Usage: $0 [-d [-v]]"
-    echo " Stashes changes by default. git stash list to see stashes"
-    echo "  -d discard all uncommited changes"
-    echo "  -v discard vendor directory changes too"
-else
-   git stash
-fi
+
+
+librenms_dir = dirname(dirname(abspath(__file__)))
+
+parser = argparse.ArgumentParser()
+group = parser.add_mutually_exclusive_group()
+group.add_argument("-d", "--discard", action="store_true", help="Discard all changes clean extra files")
+group.add_argument("-s", "--save", action="store_true", help="Save and remove changes by stashing them. (git stash)")
+group.add_argument("-r", "--restore", action="store_true", help="Attempt to restore saved changes (git stash pop)")
+parser.add_argument("-v", "--vendor", action="store_true", help="Also Discard changes to the vendor directory (requires --discard)")
+
+args = parser.parse_args()
+
+if args.vendor and not args.discard:
+    print(__file__ + ": error: argument -v/--vendor requires -d/--discard")
+    exit(1)
+
+
+if args.discard:
+    if confirm("Are you sure you want to delete all modified and untracked files?"):
+        dirs = ["contrib/", "doc/", "html/", "includes/", "lib/", "LibreNMS/",
+        "licenses/", "mibs/", "misc/", "scripts/", "sql-schema/", "tests/"]
+        call(["git", "reset", "-q"], cwd=librenms_dir)
+        call(["git", "checkout", "."], cwd=librenms_dir)
+        call(["git", "clean", "-d", "-f"] + dirs, cwd=librenms_dir)
+
+        if args.vendor:
+            call(["git", "clean",  "-x",  "-d",  "-f",  "vendor/"], cwd=librenms_dir)
+
+elif args.save:
+    msg = "github-remove saved on "+str(datetime.datetime.now())
+    call(["git", "stash", "save", msg], cwd=librenms_dir)
+
+elif args.restore:
+    list = check_output(["git", "stash", "list"])
+    last = list.decode("utf-8") .split('\n', 1)[0]
+
+    if "github-remove" in last:
+        call(["git", "stash", "pop"], cwd=librenms_dir)
+    else:
+        print("Last stash was not created by " + __file__ + ". Aborting.")