diff --git a/src/browser.hxx b/src/browser.hxx
index 498574b..96f12b6 100644
--- a/src/browser.hxx
+++ b/src/browser.hxx
@@ -262,6 +262,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
       return browser;
     }
 
+    
   protected:
     
     void closeEvent(QCloseEvent *event) {
@@ -273,6 +274,14 @@ class Browser: public QMainWindow, protected Ui::Browser {
       QApplication::exit(0);
     }
 
+
+  public Q_SLOTS:
+
+    void on_actionEditBookmarks_triggered() {
+      _editbookmarks->show();
+    }
+
+
   private Q_SLOTS:
       
     void load() {
@@ -602,10 +611,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
       }
     }
     
-    void on_actionEditBookmarks_triggered() {
-      _editbookmarks->show();
-    }
-    
     void zoom(int i) {
       LOG<<i;
       statusBar()->showMessage(tr("Zoom: %1%").arg(i));
diff --git a/src/main.cxx b/src/main.cxx
index 63785a3..06aff9f 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -334,6 +334,7 @@ int main(int argv, char** argc) try {
   bool login(false);
   Settings::MimeTypes mimetypes;
   QString bookmarks;
+  bool editbookmarks(false);
   QStringList args(app.arguments());
   std::auto_ptr<QSettings> settings
     (std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissBrowser")));
@@ -359,6 +360,8 @@ int main(int argv, char** argc) try {
          "                   start <tool> for mimetype <mime>\n"
          " -b, --bookmarks <file>\n"
          "                   load and save bookmarks from and to <file>\n"
+         " -e, --edit-bookmarks\n"
+         "                   start in bookmark-edition mode\n"
          " <url>             optional full URL\n"
          "Environment:\n"
          "  LANGUAGE              \"de\", \"en\", ...          (actual: %5)\n"
@@ -387,6 +390,8 @@ int main(int argv, char** argc) try {
       actlib = *it;
     } else if ((*it=="-b" || *it=="--bookmarks") && ++it!=args.end()) {
       bookmarks = *it;
+    } else if ((*it=="-e" || *it=="--edit-bookmarks")) {
+      editbookmarks = true;
     } else if ((*it=="-s" || *it=="--settings") && ++it!=args.end()) {
       settings = std::auto_ptr<QSettings>
         (new QSettings(*it, QSettings::IniFormat));
@@ -433,6 +438,7 @@ int main(int argv, char** argc) try {
   if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories();
   Browser browser(actlib, urls, settings.get(), mimetypes, silent,
                   login, quirks, bookmarks);
+  if (editbookmarks) browser.on_actionEditBookmarks_triggered();
   return app.exec();
  } catch (std::exception& x) {
   std::cerr<<"**** Error: "<<x.what()<<std::endl;
diff --git a/src/makefile.am b/src/makefile.am
index 4a2db9e..584f2d4 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -7,7 +7,7 @@
 
 SUBDIRS = qbrowserlib designer
 
-#include_HEADERS = @srcdir@/qbrowserlib/*.hxx
+include_HEADERS = @srcdir@/qbrowserlib/*.hxx
 
 if !MINGW32
 if MAC
diff --git a/src/swissbrowser_de.ts b/src/swissbrowser_de.ts
index 64fa2f9..3fff903 100644
--- a/src/swissbrowser_de.ts
+++ b/src/swissbrowser_de.ts
@@ -732,6 +732,8 @@ Options:
                    start &lt;tool&gt; for mimetype &lt;mime&gt;
  -b, --bookmarks &lt;file&gt;
                    load and save bookmarks from and to &lt;file&gt;
+ -e, --edit-bookmarks
+                   start in bookmark-edition mode
  &lt;url&gt;             optional full URL
 Environment:
   LANGUAGE              &quot;de&quot;, &quot;en&quot;, ...          (actual: %5)
diff --git a/src/swissbrowser_en.ts b/src/swissbrowser_en.ts
index 0989fd4..fcc171a 100644
--- a/src/swissbrowser_en.ts
+++ b/src/swissbrowser_en.ts
@@ -732,6 +732,8 @@ Options:
                    start &lt;tool&gt; for mimetype &lt;mime&gt;
  -b, --bookmarks &lt;file&gt;
                    load and save bookmarks from and to &lt;file&gt;
+ -e, --edit-bookmarks
+                   start in bookmark-edition mode
  &lt;url&gt;             optional full URL
 Environment:
   LANGUAGE              &quot;de&quot;, &quot;en&quot;, ...          (actual: %5)
diff --git a/src/swissbrowser_fr.ts b/src/swissbrowser_fr.ts
index 64fa2f9..3fff903 100644
--- a/src/swissbrowser_fr.ts
+++ b/src/swissbrowser_fr.ts
@@ -732,6 +732,8 @@ Options:
                    start &lt;tool&gt; for mimetype &lt;mime&gt;
  -b, --bookmarks &lt;file&gt;
                    load and save bookmarks from and to &lt;file&gt;
+ -e, --edit-bookmarks
+                   start in bookmark-edition mode
  &lt;url&gt;             optional full URL
 Environment:
   LANGUAGE              &quot;de&quot;, &quot;en&quot;, ...          (actual: %5)
diff --git a/src/swissbrowser_it.ts b/src/swissbrowser_it.ts
index eeb9cbb..362d361 100644
--- a/src/swissbrowser_it.ts
+++ b/src/swissbrowser_it.ts
@@ -732,6 +732,8 @@ Options:
                    start &lt;tool&gt; for mimetype &lt;mime&gt;
  -b, --bookmarks &lt;file&gt;
                    load and save bookmarks from and to &lt;file&gt;
+ -e, --edit-bookmarks
+                   start in bookmark-edition mode
  &lt;url&gt;             optional full URL
 Environment:
   LANGUAGE              &quot;de&quot;, &quot;en&quot;, ...          (actual: %5)