diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index c5f43aceb..78387c958 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-20  Alex Roitman  <shura@gramps-project.org>
 	* INSTALL: Provide correct examples for the local install.
+	* gramps.sh.in: Revert escaping the arguments, as this lumps all
+	the args into a single word. If filenames contain spaces then they
+	should be escaped by the user.
 
 2005-09-19  Don Allingham  <don@gramps-project.org>
 	* src/ReportUtils.py: better string handling
diff --git a/gramps2/gramps.sh.in b/gramps2/gramps.sh.in
index 540ca6303..b42bbee73 100644
--- a/gramps2/gramps.sh.in
+++ b/gramps2/gramps.sh.in
@@ -36,4 +36,4 @@ else
     export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$GRAMPSPLUGINSDIR:$PYTHONPATH
 fi
 
-exec @PYTHON@ $GRAMPSDIR/gramps.py "$*"
+exec @PYTHON@ $GRAMPSDIR/gramps.py $*