diff --git a/app/Resources/views/html.html.twig b/app/Resources/views/html.html.twig
index d9c36f1..6b035d4 100644
--- a/app/Resources/views/html.html.twig
+++ b/app/Resources/views/html.html.twig
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     <title>{% block title %}PrintABrick{% endblock %}</title>
     {% block stylesheets %}
-        <link rel="stylesheet" href="{{ asset('resources/css/main.css') }}">
+        <link rel="stylesheet" href="{{ fileTimestamp(asset('resources/css/main.css')) }}">
     {% endblock %}
     <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
     <link rel="apple-touch-icon" sizes="180x180" href="{{ asset('apple-touch-icon.png') }}">
@@ -20,11 +20,9 @@
     
 {% endblock %}
 {% block javascripts %}
-    <script type="text/javascript" src="{{ asset('resources/js/three.js') }}"></script>
-
-    <script type="text/javascript" src="{{ asset('resources/js/OrbitControls.js') }}"></script>
-
-    <script src="{{ asset('resources/js/main.js') }}"></script>
+    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/three.js')) }}"></script>
+    <script type="text/javascript" src="{{ fileTimestamp(asset('resources/js/OrbitControls.js')) }}"></script>
+    <script src="{{ fileTimestamp(asset('resources/js/main.js')) }}"></script>
 {% endblock %}
 </body>
 </html>
diff --git a/src/AppBundle/Twig/AppExtension.php b/src/AppBundle/Twig/AppExtension.php
index f3b0542..f46e7db 100644
--- a/src/AppBundle/Twig/AppExtension.php
+++ b/src/AppBundle/Twig/AppExtension.php
@@ -32,6 +32,7 @@ class AppExtension extends \Twig_Extension
             new \Twig_SimpleFunction('remoteSize', [$this, 'remoteSize']),
             new \Twig_SimpleFunction('remoteFilename', [$this, 'remoteFilename']),
             new \Twig_SimpleFunction('remoteFileExists', [$this, 'remoteFileExists']),
+            new \Twig_SimpleFunction('fileTimestamp', [$this, 'fileTimestamp']),
         ];
     }
 
@@ -72,6 +73,15 @@ class AppExtension extends \Twig_Extension
         return $size;
     }
 
+    public function fileTimestamp($filePath) {
+        $changeDate = filemtime($_SERVER['DOCUMENT_ROOT'].'/'.$filePath);
+        if (!$changeDate) {
+            //Fallback if mtime could not be found:
+            $changeDate = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
+        }
+        return $filePath.'?'.$changeDate;
+    }
+
     public function remoteFilename($url)
     {
         return basename($url);