diff --git a/Changelog.md b/Changelog.md
index b5a93efdb..3c17f26b9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@
 
 * Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980)
 
+## Bug Fixes
+
+* exec foreman in ./script/server to replace the process so that we can Ctrl+C it again.
+
 # 0.0.3.0
 
 ## Refactor
diff --git a/script/server b/script/server
index fab954e93..e31b4de5b 100755
--- a/script/server
+++ b/script/server
@@ -115,4 +115,4 @@ else
 fi
 echo ""
 
-bundle exec foreman start -m "web=1,worker=$workers" -p $port
+exec bundle exec foreman start -m "web=1,worker=$workers" -p $port