--- gmain.c.orig	Mon Jul 25 12:18:05 2005
+++ gmain.c	Mon Sep 11 16:05:05 2006
@@ -668,6 +668,7 @@
 
 int main(int argc, char** argv)
 {
+    int options = 1;
     /* Initialize some defaults from environment variables,
      * before reading cmdline args.
      */
@@ -681,8 +682,11 @@
 
     while (argc > 1)
     {
-        if (argv[1][0] == '-') {
-            CheckArg(argv[1][1]);
+        if (argv[1][0] == '-' && options) {
+	    if (argv[1][1] != '-')
+                CheckArg(argv[1][1]);
+	    else
+		options = 0;
         }
         else {
             PhoImage* img = NewPhoImage(argv[1]);
--- pho.c.orig	Mon Mar 21 07:28:03 2005
+++ pho.c	Mon Sep 11 16:05:05 2006
@@ -439,6 +439,7 @@
     printf("\t-d: Debug messages\n");
     printf("\t-h: Help: Print this summary\n");
     printf("\t-v: Verbose help: Print a summary of key bindings\n");
+    printf("\t--: Assume no more options are given\n");
     exit(1);
 }