diff --git a/ChangeLog b/ChangeLog
index d4e922c..d3f46e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-10  Peter Cooper  <comrade@obverse.com.au>
+
+	* DBModeler/Resources/Info-gnustep.plist: New file.
+	* DBModeler/Modeler.m (-applicationWillFinishLaunching:): Rearrange
+	menu layout.
+
 2005-07-09  Matt Rice <ratmice@yahoo.com>
 
 	* DBModeler/ConsistencyChecker.m: New variable doc.
diff --git a/DBModeler/Modeler.m b/DBModeler/Modeler.m
index a4b61af..69773da 100644
--- a/DBModeler/Modeler.m
+++ b/DBModeler/Modeler.m
@@ -116,22 +116,7 @@
 
   [mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: _(@"Info")]];
   [subMenu release];
-  subMenu = [[NSMenu alloc] init];
-  
-  subMenu = [[NSMenu alloc] init];
-  [subMenu setAutoenablesItems:YES];
 
-  [subMenu addItemWithTitle: _(@"Copy")
-                     action: @selector(copy:)
-	      keyEquivalent:@"c"];
-  [subMenu addItemWithTitle: _(@"Cut")
-                     action: @selector(cut:)
-	      keyEquivalent:@"x"];
-  [subMenu addItemWithTitle: _(@"Paste")
-                     action: @selector(paste:)
-	      keyEquivalent:@"v"];
-  [mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: _(@"Edit")]];
-  [subMenu release];
   subMenu = [[NSMenu alloc] init];
    
  
@@ -174,6 +159,23 @@
   [mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle:_(@"Model")]];
   [subMenu release];
 
+  subMenu = [[NSMenu alloc] init];
+  
+  subMenu = [[NSMenu alloc] init];
+  [subMenu setAutoenablesItems:YES];
+
+  [subMenu addItemWithTitle: _(@"Copy")
+                     action: @selector(copy:)
+	      keyEquivalent:@"c"];
+  [subMenu addItemWithTitle: _(@"Cut")
+                     action: @selector(cut:)
+	      keyEquivalent:@"x"];
+  [subMenu addItemWithTitle: _(@"Paste")
+                     action: @selector(paste:)
+	      keyEquivalent:@"v"];
+  [mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: _(@"Edit")]];
+  [subMenu release];
+
   
   subMenu = [[NSMenu alloc] init];
   [subMenu addItemWithTitle:_(@"Inspector")
diff --git a/DBModeler/Resources/Info-gnustep.plist b/DBModeler/Resources/Info-gnustep.plist
new file mode 100644
index 0000000..fe7fec9
--- /dev/null
+++ b/DBModeler/Resources/Info-gnustep.plist
@@ -0,0 +1,26 @@
+{
+    ApplicationDescription = "GDL2 EOModel editor";
+    ApplicationIcon = DBModeler;
+    ApplicationName = DBModeler;
+    ApplicationRelease = "0.0.0 (Alpha)";
+    ApplicationURL = "http://mediawiki.gnustep.org/index.php/DBModeler";
+    Authors = (
+        "Matt Rice <ratmice@yahoo.com>"
+    );
+    Copyright = "Copyright \U00A9 2005 Free Software Foundation";
+    CopyrightDescription = "Released under the GNU GPL. See COPYING for details.";
+    FullVersionID = 0.0.0;
+    GSMainMarkupFile = "";
+    NSExecutable = DBModeler;
+    NSIcon = DBModeler.tiff;
+    NSRole = "Editor";
+    NSTypes = (
+      {
+        NSUnixExtensions = ( "eomodeld", "eomodel" );
+        NSIcon = "EOModel.tiff";
+      }
+    );
+
+    NSMainNibFile = "";
+    NSPrincipalClass = NSApplication;
+}