diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index 433ee85..62d9771 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -311,6 +311,9 @@
     if args['tag'] is None:
         args['tag'] = 'FROMGIT: '
 
+    if args['replace']:
+        _git(['reset', '--hard', 'HEAD~1'])
+
     return _git_returncode(['cherry-pick', commit])
 
 def main(args):