diff --git a/admin_manual/configuration/configuration_language.rst b/admin_manual/configuration/configuration_language.rst
new file mode 100644
index 000000000..386d7d8fe
--- /dev/null
+++ b/admin_manual/configuration/configuration_language.rst
@@ -0,0 +1,24 @@
+Language Configuration
+======================
+
+In normal cases ownCloud will automatically detect the language of the Web-GUI.
+If this doesn't work properly or you want to make sure that ownCloud always
+starts with a given language, you can use the **default_language** parameter.
+
+Please keep in mind, that this will not effect a users language preference,
+which has been configured under "personal -> language" once he has logged in.
+
+Please check :file:`settings/languageCodes.php` for the list of supported language
+codes. 
+
+
+Parameters
+----------
+
+.. code-block:: php
+
+  <?php
+
+    "default_language" => "en",
+
+This parameters can be set in the :file:`config/config.php`
diff --git a/admin_manual/configuration/configuration_maintenance.rst b/admin_manual/configuration/configuration_maintenance.rst
new file mode 100644
index 000000000..7d4ff8245
--- /dev/null
+++ b/admin_manual/configuration/configuration_maintenance.rst
@@ -0,0 +1,21 @@
+Maintenance Mode Configuration
+==============================
+
+If you want to prevent users to login to ownCloud before you start doing
+some maintenance work, you need to set the value of the **maintenance**
+parameter to *true*. Please keep in mind that users who are already logged-in
+are kicked out of ownCloud instantly.
+
+
+
+
+Parameters
+----------
+
+.. code-block:: php
+
+  <?php
+
+    "maintenance" => false,
+
+This parameters can be set in the :file:`config/config.php`