diff --git a/scm-webapp/src/main/webapp/index.html b/scm-webapp/src/main/webapp/index.html
index ae9ff6a176..05483ea295 100644
--- a/scm-webapp/src/main/webapp/index.html
+++ b/scm-webapp/src/main/webapp/index.html
@@ -211,6 +211,15 @@
       <input type="hidden" id="x-history-field" />
       <iframe id="x-history-frame"></iframe>
     </form>
-
+    
+    <noscript>
+      <div class="noscript-container">
+        <h1>SCM-Manager</h1>
+        <p>
+          <b>Warning:</b> SCM-Manager requires JavaScript. 
+          Please enable JavaScript in your browser and try again.
+        <p>
+      </div>
+    </noscript>
   </body>
 </html>
\ No newline at end of file
diff --git a/scm-webapp/src/main/webapp/resources/css/style.css b/scm-webapp/src/main/webapp/resources/css/style.css
index 05ee6d9971..0adbcadd9f 100644
--- a/scm-webapp/src/main/webapp/resources/css/style.css
+++ b/scm-webapp/src/main/webapp/resources/css/style.css
@@ -183,3 +183,22 @@ li.scm-removed {
   background-image: url(../images/delete.png);
 }
 
+
+div.noscript-container {
+  background-color: #ffffff;
+  margin: 10px;
+  color: #202020;
+  font-family: Verdana,Helvetica,Arial,sans-serif;  
+  font-size: 12px;
+  margin: 1em;
+}
+
+div.noscript-container h1 {
+  font-size: 18px;
+  font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+  font-weight: bold;
+  margin: 0.5em 0em;
+  padding: 0px;
+  color: #D20005;
+  border-bottom: 1px solid #AFAFAF;
+}