diff --git a/doc/changelog.txt b/doc/changelog.txt
index 88beac50..0d960c44 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,9 @@
 Fixes:
 - checking: Do not remove CGI parameters when joining URLs.
 
+Changes:
+- gui: Use Alt-key shortcuts for menu entries.
+
 
 6.3 "Due Date" (released 6.2.2011)
 
diff --git a/linkcheck/gui/linkchecker_ui_main.py b/linkcheck/gui/linkchecker_ui_main.py
index 7a806bf1..ea7ac563 100644
--- a/linkcheck/gui/linkchecker_ui_main.py
+++ b/linkcheck/gui/linkchecker_ui_main.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/main.ui'
 #
-# Created: Tue Feb  1 07:31:54 2011
+# Created: Wed Feb  9 07:31:00 2011
 #      by: PyQt4 UI code generator 4.7.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -624,10 +624,10 @@ class Ui_MainWindow(object):
         self.menubar.setObjectName("menubar")
         self.menuEdit = QtGui.QMenu(self.menubar)
         self.menuEdit.setObjectName("menuEdit")
-        self.menuLinkChecka = QtGui.QMenu(self.menubar)
-        self.menuLinkChecka.setObjectName("menuLinkChecka")
         self.menuHelp = QtGui.QMenu(self.menubar)
         self.menuHelp.setObjectName("menuHelp")
+        self.menuFile = QtGui.QMenu(self.menubar)
+        self.menuFile.setObjectName("menuFile")
         MainWindow.setMenuBar(self.menubar)
         self.statusBar = QtGui.QStatusBar(MainWindow)
         self.statusBar.setObjectName("statusBar")
@@ -680,13 +680,13 @@ class Ui_MainWindow(object):
         self.actionCheckUpdates = QtGui.QAction(MainWindow)
         self.actionCheckUpdates.setObjectName("actionCheckUpdates")
         self.menuEdit.addAction(self.actionOptions)
-        self.menuLinkChecka.addAction(self.actionSave)
-        self.menuLinkChecka.addAction(self.actionQuit)
         self.menuHelp.addAction(self.actionAbout)
         self.menuHelp.addAction(self.actionHelp)
         self.menuHelp.addAction(self.actionDebug)
         self.menuHelp.addAction(self.actionCheckUpdates)
-        self.menubar.addAction(self.menuLinkChecka.menuAction())
+        self.menuFile.addAction(self.actionSave)
+        self.menuFile.addAction(self.actionQuit)
+        self.menubar.addAction(self.menuFile.menuAction())
         self.menubar.addAction(self.menuEdit.menuAction())
         self.menubar.addAction(self.menuHelp.menuAction())
         self.label.setBuddy(self.urlinput)
@@ -727,14 +727,17 @@ class Ui_MainWindow(object):
         self.label_20.setText(_("Avg. length"))
         self.label_19.setText(_("Max. length"))
         self.label_14.setText(_("Domains"))
-        self.menuEdit.setTitle(_("Edit"))
-        self.menuLinkChecka.setTitle(_("File"))
-        self.menuHelp.setTitle(_("Help"))
-        self.actionAbout.setText(_("About"))
-        self.actionHelp.setText(_("Help"))
+        self.menuEdit.setTitle(_("&Edit"))
+        self.menuHelp.setTitle(_("&Help"))
+        self.menuFile.setTitle(_("&File"))
+        self.actionAbout.setText(_("A&bout"))
+        self.actionAbout.setIconText(_("About"))
+        self.actionHelp.setText(_("&Help"))
+        self.actionHelp.setIconText(_("Help"))
         self.actionViewOnline.setText(_("View online"))
         self.actionViewOnline.setToolTip(_("View URL online"))
-        self.actionOptions.setText(_("Options"))
+        self.actionOptions.setText(_("&Options"))
+        self.actionOptions.setIconText(_("Options"))
         self.actionCopyToClipboard.setText(_("Copy to clipboard"))
         self.actionCopyToClipboard.setToolTip(_("Copy URL to clipboard"))
         self.actionCopyToClipboard.setShortcut(_("Ctrl+C"))
@@ -745,9 +748,9 @@ class Ui_MainWindow(object):
         self.actionDebug.setText(_("Show debug"))
         self.actionViewProperties.setText(_("View properties"))
         self.actionViewProperties.setToolTip(_("View URL properties"))
-        self.actionSave.setText(_("Save results..."))
+        self.actionSave.setText(_("&Save results..."))
         self.actionSave.setShortcut(_("Ctrl+S"))
-        self.actionQuit.setText(_("Quit"))
+        self.actionQuit.setText(_("&Quit"))
         self.actionQuit.setShortcut(_("Ctrl+Q"))
         self.actionCheckUpdates.setText(_("Check for updates"))
 
diff --git a/linkcheck/gui/ui/main.ui b/linkcheck/gui/ui/main.ui
index bd60038f..e39a1115 100644
--- a/linkcheck/gui/ui/main.ui
+++ b/linkcheck/gui/ui/main.ui
@@ -1274,27 +1274,27 @@
    </property>
    <widget class="QMenu" name="menuEdit">
     <property name="title">
-     <string>Edit</string>
+     <string>&amp;Edit</string>
     </property>
     <addaction name="actionOptions"/>
    </widget>
-   <widget class="QMenu" name="menuLinkChecka">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionSave"/>
-    <addaction name="actionQuit"/>
-   </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>Help</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionAbout"/>
     <addaction name="actionHelp"/>
     <addaction name="actionDebug"/>
     <addaction name="actionCheckUpdates"/>
    </widget>
-   <addaction name="menuLinkChecka"/>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionSave"/>
+    <addaction name="actionQuit"/>
+   </widget>
+   <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
    <addaction name="menuHelp"/>
   </widget>
@@ -1305,6 +1305,9 @@
      <normaloff>:/icons/about.png</normaloff>:/icons/about.png</iconset>
    </property>
    <property name="text">
+    <string>A&amp;bout</string>
+   </property>
+   <property name="iconText">
     <string>About</string>
    </property>
   </action>
@@ -1314,6 +1317,9 @@
      <normaloff>:/icons/help.png</normaloff>:/icons/help.png</iconset>
    </property>
    <property name="text">
+    <string>&amp;Help</string>
+   </property>
+   <property name="iconText">
     <string>Help</string>
    </property>
   </action>
@@ -1335,6 +1341,9 @@
      <normaloff>:/icons/preferences.png</normaloff>:/icons/preferences.png</iconset>
    </property>
    <property name="text">
+    <string>&amp;Options</string>
+   </property>
+   <property name="iconText">
     <string>Options</string>
    </property>
   </action>
@@ -1396,7 +1405,7 @@
      <normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
    </property>
    <property name="text">
-    <string>Save results...</string>
+    <string>&amp;Save results...</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
@@ -1408,7 +1417,7 @@
      <normaloff>:/icons/exit.png</normaloff>:/icons/exit.png</iconset>
    </property>
    <property name="text">
-    <string>Quit</string>
+    <string>&amp;Quit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>