diff --git a/Gruntfile.js b/Gruntfile.js
index 24ab9df..edbf621 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,27 +13,30 @@
  * TODO: Use https://www.npmjs.com/package/grunt-contrib-yuidoc
  * TODO: Implement a LaTeX generator for a pdf of the dokumentation 
  */
+
+// Generate requireJS files for l10n
+var reqTasks = [];
+for (var i in {'en' : 0, 'de' : 1}) {
+  reqTasks.push({
+    options: {
+      // optimize: "uglify",
+      baseUrl: 'dev/js/src',
+      paths : {
+	'lib': '../lib'
+      },
+      wrap:true,
+      // dir : 'public/js',
+      name: 'lib/almond',
+      include : ['app/' + i],
+      out: 'public/js/kalamar-<%= pkg.version %>-' + i + '.js'
+    }
+  })
+};
+
 module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    requirejs: {
-      compile: {
-	options: {
-	  // optimize: "uglify",
-	  baseUrl: 'dev/js/src',
-	  paths : {
-	    'lib': '../lib'
-	  },
-
-	  // TODO: add language versions
-	  wrap:true,
-	  // dir : 'public/js',
-	  name: 'lib/almond',
-	  include : ['app/en'],
-	  out: 'public/js/kalamar-<%= pkg.version %>-en.js'
-	}
-      }
-    },
+    requirejs: reqTasks,
     imagemin: {
       dynamic: {
 	files: [{
diff --git a/dev/js/src/app/de.js b/dev/js/src/app/de.js
index fc576f2..f5be5ec 100644
--- a/dev/js/src/app/de.js
+++ b/dev/js/src/app/de.js
@@ -1,4 +1,4 @@
-define(['init'], function () {
+require(['init'], function () {
   var loc = KorAP.Locale;
   loc.OR = 'oder';
   loc.AND = 'und';
diff --git a/kalamar.conf b/kalamar.conf
index 74d8201..b3e8a65 100644
--- a/kalamar.conf
+++ b/kalamar.conf
@@ -70,7 +70,7 @@
 	pubOn => 'veröffentlicht am',
 	matchCount => 'Treffer',
 	noMatches => 'Es wurden keine Treffer für <code><%= stash("q") %></code> gefunden.',
-	jsFile => 'kalamar-<%= $Kalamar::VERSION %>-en.js',
+	jsFile => 'kalamar-<%= $Kalamar::VERSION %>-de.js',
 	korap => {
 	  -short => 'KorAP',
 	  desc => 'KorAP - Korpusanalyseplattform der nächsten Generation',
diff --git a/templates/match.html.ep b/templates/match.html.ep
index 56bfcf1..627adbc 100644
--- a/templates/match.html.ep
+++ b/templates/match.html.ep
@@ -19,5 +19,6 @@
 <% if ($match->{title} || $match->{author}) { %>;<% } %> \
 <%= loc('pubOn') %> <%= $match->{pubDate} %> \
 (<%= $id %>)\
+%# Add textClass
 </p>
 </li>