diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 7d4335984b9..c7b3daa2432 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -42,7 +42,7 @@ function printBookmarksList ($aDb, $aLangs)
 
 	$bookm = new Bookmark($db);
 
-	$langs->load("bookmarks");
+	$langs->load("@bookmarks");
 
 	$url= $_SERVER["PHP_SELF"].(! empty($_SERVER["QUERY_STRING"])?'?'.$_SERVER["QUERY_STRING"]:'');
 
diff --git a/htdocs/langs/ar_AR/bookmarks.lang b/htdocs/bookmarks/langs/ar_AR/bookmarks.lang
similarity index 96%
rename from htdocs/langs/ar_AR/bookmarks.lang
rename to htdocs/bookmarks/langs/ar_AR/bookmarks.lang
index 007f8806fd3..890d47be5de 100644
--- a/htdocs/langs/ar_AR/bookmarks.lang
+++ b/htdocs/bookmarks/langs/ar_AR/bookmarks.lang
@@ -1,16 +1,16 @@
-/*
- * Language code: ar_AR
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-11 13:27:01
- */
-
-
-// Date 2009-08-11 13:27:01
-// START - Lines generated via autotranslator.php tool.
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=العناوين
-NewBookmark=إشارة مرجعية جديدة
-AddThisPageToBookmarks=أضف هذه الصفحة إلى المفضلة
-// Date 2009-08-11 13:27:01
-// STOP - Lines generated via parser
+/*
+ * Language code: ar_AR
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-11 13:27:01
+ */
+
+
+// Date 2009-08-11 13:27:01
+// START - Lines generated via autotranslator.php tool.
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=العناوين
+NewBookmark=إشارة مرجعية جديدة
+AddThisPageToBookmarks=أضف هذه الصفحة إلى المفضلة
+// Date 2009-08-11 13:27:01
+// STOP - Lines generated via parser
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/bookmarks/langs/ca_ES/bookmarks.lang
similarity index 97%
rename from htdocs/langs/ca_ES/bookmarks.lang
rename to htdocs/bookmarks/langs/ca_ES/bookmarks.lang
index 5fe36fda2b2..968b943646b 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/bookmarks/langs/ca_ES/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - ca_ES - marque pages 
-CHARSET= UTF-8
-Bookm= Marcadors
-NewBookmark= Nou Marcador
-AddThisPageToBookmarks= Afigeix aquesta pàgina als marcadors
+# Dolibarr language file - ca_ES - marque pages 
+CHARSET= UTF-8
+Bookm= Marcadors
+NewBookmark= Nou Marcador
+AddThisPageToBookmarks= Afigeix aquesta pàgina als marcadors
diff --git a/htdocs/langs/da_DA/bookmarks.lang b/htdocs/bookmarks/langs/da_DA/bookmarks.lang
similarity index 96%
rename from htdocs/langs/da_DA/bookmarks.lang
rename to htdocs/bookmarks/langs/da_DA/bookmarks.lang
index 9268ecdf492..f2848e9952f 100644
--- a/htdocs/langs/da_DA/bookmarks.lang
+++ b/htdocs/bookmarks/langs/da_DA/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: da_DA
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 20:39:59
- */
-
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 20:39:59).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Bogmærker
-NewBookmark=Nyt bogmærke
-AddThisPageToBookmarks=Tilføj denne side til bogmærker
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:39:59).
+/*
+ * Language code: da_DA
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 20:39:59
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 20:39:59).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Bogmærker
+NewBookmark=Nyt bogmærke
+AddThisPageToBookmarks=Tilføj denne side til bogmærker
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:39:59).
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/htdocs/bookmarks/langs/de_DE/bookmarks.lang
similarity index 96%
rename from htdocs/langs/de_DE/bookmarks.lang
rename to htdocs/bookmarks/langs/de_DE/bookmarks.lang
index 17ebb6ac3fd..6a0c4893f56 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/bookmarks/langs/de_DE/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: de_DE
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 20:42:36
- */
-
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 20:42:36).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Lesezeichen
-NewBookmark=Neue Lesezeichen
-AddThisPageToBookmarks=Fügen Sie diese Seite zu Lesezeichen
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:42:36).
+/*
+ * Language code: de_DE
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 20:42:36
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 20:42:36).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Lesezeichen
+NewBookmark=Neue Lesezeichen
+AddThisPageToBookmarks=Fügen Sie diese Seite zu Lesezeichen
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:42:36).
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/bookmarks/langs/en_US/bookmarks.lang
similarity index 97%
rename from htdocs/langs/en_US/bookmarks.lang
rename to htdocs/bookmarks/langs/en_US/bookmarks.lang
index bc0d329a1a1..3d106ebab59 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/bookmarks/langs/en_US/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - en_US - marque pages
-CHARSET=UTF-8
-Bookm=Bookmarks
-NewBookmark=New bookmark
+# Dolibarr language file - en_US - marque pages
+CHARSET=UTF-8
+Bookm=Bookmarks
+NewBookmark=New bookmark
 AddThisPageToBookmarks=Add this page to bookmarks
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/bookmarks.lang b/htdocs/bookmarks/langs/es_ES/bookmarks.lang
similarity index 97%
rename from htdocs/langs/es_ES/bookmarks.lang
rename to htdocs/bookmarks/langs/es_ES/bookmarks.lang
index 296a113d499..6ea5c909bdd 100644
--- a/htdocs/langs/es_ES/bookmarks.lang
+++ b/htdocs/bookmarks/langs/es_ES/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - es_ES - marque pages 
-CHARSET= UTF-8
-Bookm= Marcadores
-NewBookmark= Nuevo Marcador
-AddThisPageToBookmarks= Añadir esta página en los marcadores
+# Dolibarr language file - es_ES - marque pages 
+CHARSET= UTF-8
+Bookm= Marcadores
+NewBookmark= Nuevo Marcador
+AddThisPageToBookmarks= Añadir esta página en los marcadores
diff --git a/htdocs/langs/fi_FI/bookmarks.lang b/htdocs/bookmarks/langs/fi_FI/bookmarks.lang
similarity index 96%
rename from htdocs/langs/fi_FI/bookmarks.lang
rename to htdocs/bookmarks/langs/fi_FI/bookmarks.lang
index 0a7a5afb17a..c43ebcee8b3 100644
--- a/htdocs/langs/fi_FI/bookmarks.lang
+++ b/htdocs/bookmarks/langs/fi_FI/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: fi_FI
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 20:45:19
- */
-
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 20:45:19).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Kirjanmerkit
-NewBookmark=Uusi kirjanmerkki
-AddThisPageToBookmarks=Lisää tämä sivu kirjanmerkkeihin
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:45:19).
+/*
+ * Language code: fi_FI
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 20:45:19
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 20:45:19).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Kirjanmerkit
+NewBookmark=Uusi kirjanmerkki
+AddThisPageToBookmarks=Lisää tämä sivu kirjanmerkkeihin
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:45:19).
diff --git a/htdocs/langs/fr_FR/bookmarks.lang b/htdocs/bookmarks/langs/fr_FR/bookmarks.lang
similarity index 97%
rename from htdocs/langs/fr_FR/bookmarks.lang
rename to htdocs/bookmarks/langs/fr_FR/bookmarks.lang
index ae7c57be840..85fa84bebc3 100644
--- a/htdocs/langs/fr_FR/bookmarks.lang
+++ b/htdocs/bookmarks/langs/fr_FR/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - fr_FR - marque pages
-CHARSET=UTF-8
-Bookm=Marque pages
-NewBookmark=Nouveau marque page
+# Dolibarr language file - fr_FR - marque pages
+CHARSET=UTF-8
+Bookm=Marque pages
+NewBookmark=Nouveau marque page
 AddThisPageToBookmarks=Placer cette page dans les marques-pages
\ No newline at end of file
diff --git a/htdocs/langs/it_IT/bookmarks.lang b/htdocs/bookmarks/langs/it_IT/bookmarks.lang
similarity index 97%
rename from htdocs/langs/it_IT/bookmarks.lang
rename to htdocs/bookmarks/langs/it_IT/bookmarks.lang
index acbd1b8e3d7..b4f1f55aecc 100644
--- a/htdocs/langs/it_IT/bookmarks.lang
+++ b/htdocs/bookmarks/langs/it_IT/bookmarks.lang
@@ -1,13 +1,13 @@
-/*
- * Language code: it_IT
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 20:49:18
- */
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 20:49:18).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Segnalibri
-NewBookmark=Nuovo segnalibro
-AddThisPageToBookmarks=Aggiungi questa pagina ai preferiti
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:49:18).
+/*
+ * Language code: it_IT
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 20:49:18
+ */
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 20:49:18).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Segnalibri
+NewBookmark=Nuovo segnalibro
+AddThisPageToBookmarks=Aggiungi questa pagina ai preferiti
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:49:18).
diff --git a/htdocs/langs/nl_BE/bookmarks.lang b/htdocs/bookmarks/langs/nl_BE/bookmarks.lang
similarity index 97%
rename from htdocs/langs/nl_BE/bookmarks.lang
rename to htdocs/bookmarks/langs/nl_BE/bookmarks.lang
index 90a7b6a6ddf..1e31be7ca65 100644
--- a/htdocs/langs/nl_BE/bookmarks.lang
+++ b/htdocs/bookmarks/langs/nl_BE/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - nl_BE - marque pages
-CHARSET=UTF-8
-Bookm=Bladwijzers
-NewBookmark=Nieuwe bladwijzer
+# Dolibarr language file - nl_BE - marque pages
+CHARSET=UTF-8
+Bookm=Bladwijzers
+NewBookmark=Nieuwe bladwijzer
 AddThisPageToBookmarks=Voeg deze pagina toe aan bladwijzers
\ No newline at end of file
diff --git a/htdocs/langs/nl_NL/bookmarks.lang b/htdocs/bookmarks/langs/nl_NL/bookmarks.lang
similarity index 97%
rename from htdocs/langs/nl_NL/bookmarks.lang
rename to htdocs/bookmarks/langs/nl_NL/bookmarks.lang
index 5333609b8c0..72be5a3b02f 100644
--- a/htdocs/langs/nl_NL/bookmarks.lang
+++ b/htdocs/bookmarks/langs/nl_NL/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - nl_NL - marque pages
-CHARSET=UTF-8
-Bookm=Weblinks
-NewBookmark=Nieuwe weblink
+# Dolibarr language file - nl_NL - marque pages
+CHARSET=UTF-8
+Bookm=Weblinks
+NewBookmark=Nieuwe weblink
 AddThisPageToBookmarks=Voeg deze webpagina toe aan de weblinks
\ No newline at end of file
diff --git a/htdocs/langs/pl_PL/bookmarks.lang b/htdocs/bookmarks/langs/pl_PL/bookmarks.lang
similarity index 96%
rename from htdocs/langs/pl_PL/bookmarks.lang
rename to htdocs/bookmarks/langs/pl_PL/bookmarks.lang
index eed80596c15..207fccb0bc5 100644
--- a/htdocs/langs/pl_PL/bookmarks.lang
+++ b/htdocs/bookmarks/langs/pl_PL/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: pl_PL
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 21:07:31
- */
-
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 21:07:31).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Zakładki
-NewBookmark=Nowa zakładka
-AddThisPageToBookmarks=Dodaj tę stronę do zakładek
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:07:31).
+/*
+ * Language code: pl_PL
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 21:07:31
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 21:07:31).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Zakładki
+NewBookmark=Nowa zakładka
+AddThisPageToBookmarks=Dodaj tę stronę do zakładek
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:07:31).
diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/bookmarks/langs/pt_BR/bookmarks.lang
similarity index 96%
rename from htdocs/langs/pt_BR/bookmarks.lang
rename to htdocs/bookmarks/langs/pt_BR/bookmarks.lang
index 9a55a0c8cd5..45245b7ecfe 100644
--- a/htdocs/langs/pt_BR/bookmarks.lang
+++ b/htdocs/bookmarks/langs/pt_BR/bookmarks.lang
@@ -1,7 +1,7 @@
-# Dolibarr language file - pt_BR rev. 0.0 - marque pages
-CHARSET=UTF-8
-Bookm=Favoritos
-NewBookmark=Novo Favorito
-AddThisPageToBookmarks=Adicionar esta página aos Favoritos
-
-
+# Dolibarr language file - pt_BR rev. 0.0 - marque pages
+CHARSET=UTF-8
+Bookm=Favoritos
+NewBookmark=Novo Favorito
+AddThisPageToBookmarks=Adicionar esta página aos Favoritos
+
+
diff --git a/htdocs/langs/pt_PT/bookmarks.lang b/htdocs/bookmarks/langs/pt_PT/bookmarks.lang
similarity index 97%
rename from htdocs/langs/pt_PT/bookmarks.lang
rename to htdocs/bookmarks/langs/pt_PT/bookmarks.lang
index ac612ca1b36..185ed957dc1 100644
--- a/htdocs/langs/pt_PT/bookmarks.lang
+++ b/htdocs/bookmarks/langs/pt_PT/bookmarks.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - pt_PT - marque pages 
-CHARSET=UTF-8
-Bookm=Favoritos
-NewBookmark=Novo Favorito
-AddThisPageToBookmarks=Adicionar esta página aos Favoritos
+# Dolibarr language file - pt_PT - marque pages 
+CHARSET=UTF-8
+Bookm=Favoritos
+NewBookmark=Novo Favorito
+AddThisPageToBookmarks=Adicionar esta página aos Favoritos
diff --git a/htdocs/langs/ro_RO/bookmarks.lang b/htdocs/bookmarks/langs/ro_RO/bookmarks.lang
similarity index 96%
rename from htdocs/langs/ro_RO/bookmarks.lang
rename to htdocs/bookmarks/langs/ro_RO/bookmarks.lang
index 3928b16bedc..5bf11448e5b 100644
--- a/htdocs/langs/ro_RO/bookmarks.lang
+++ b/htdocs/bookmarks/langs/ro_RO/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: ro_RO
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 21:12:07
- */
-
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 21:12:07).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Marcaje
-NewBookmark=Marcaj nou
-AddThisPageToBookmarks=Adăugaţi această pagină la marcajele
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:12:07).
+/*
+ * Language code: ro_RO
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 21:12:07
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 21:12:07).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Marcaje
+NewBookmark=Marcaj nou
+AddThisPageToBookmarks=Adăugaţi această pagină la marcajele
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:12:07).
diff --git a/htdocs/langs/ru_RU/bookmarks.lang b/htdocs/bookmarks/langs/ru_RU/bookmarks.lang
similarity index 97%
rename from htdocs/langs/ru_RU/bookmarks.lang
rename to htdocs/bookmarks/langs/ru_RU/bookmarks.lang
index d694591feea..429e4baee4b 100644
--- a/htdocs/langs/ru_RU/bookmarks.lang
+++ b/htdocs/bookmarks/langs/ru_RU/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: ru_RU
- * Automatic generated via autotranslator.php tool
- * Generation date 2009-08-13 21:14:36
- */
-
-
-// START - Lines generated via autotranslator.php tool (2009-08-13 21:14:36).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Закладки
-NewBookmark=Новая закладка
-AddThisPageToBookmarks=Добавить эту страницу в закладки
-// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:14:36).
+/*
+ * Language code: ru_RU
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2009-08-13 21:14:36
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2009-08-13 21:14:36).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Закладки
+NewBookmark=Новая закладка
+AddThisPageToBookmarks=Добавить эту страницу в закладки
+// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:14:36).
diff --git a/htdocs/langs/tr_TR/bookmarks.lang b/htdocs/bookmarks/langs/tr_TR/bookmarks.lang
similarity index 96%
rename from htdocs/langs/tr_TR/bookmarks.lang
rename to htdocs/bookmarks/langs/tr_TR/bookmarks.lang
index c9d5409ff14..1b4be7e87b6 100644
--- a/htdocs/langs/tr_TR/bookmarks.lang
+++ b/htdocs/bookmarks/langs/tr_TR/bookmarks.lang
@@ -1,14 +1,14 @@
-/*
- * Language code: tr_TR
- * Automatic generated via autotranslator.php tool
- * Generation date 2010-03-15 19:05:26
- */
-
-
-// START - Lines generated via autotranslator.php tool (2010-03-15 19:05:26).
-// Reference language: en_US
-CHARSET=UTF-8
-Bookm=Imleri
-NewBookmark=Yeni yer imi
-AddThisPageToBookmarks=Imleri Bu sayfayı ekle
-// STOP - Lines generated via autotranslator.php tool (2010-03-15 19:05:26).
+/*
+ * Language code: tr_TR
+ * Automatic generated via autotranslator.php tool
+ * Generation date 2010-03-15 19:05:26
+ */
+
+
+// START - Lines generated via autotranslator.php tool (2010-03-15 19:05:26).
+// Reference language: en_US
+CHARSET=UTF-8
+Bookm=Imleri
+NewBookmark=Yeni yer imi
+AddThisPageToBookmarks=Imleri Bu sayfayı ekle
+// STOP - Lines generated via autotranslator.php tool (2010-03-15 19:05:26).
diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php
index 2e2d635f193..b82d9a53b1f 100644
--- a/htdocs/includes/modules/modBookmark.class.php
+++ b/htdocs/includes/modules/modBookmark.class.php
@@ -67,6 +67,7 @@ class modBookmark extends DolibarrModules
 		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
+		$this->langfiles = array("@bookmarks");
 
 		// Config pages
 		$this->config_page_url = array('bookmark.php@bookmarks');