diff --git a/cfg/projects/Komikku.json b/cfg/projects/Komikku.json
new file mode 100644
index 00000000..653344e1
--- /dev/null
+++ b/cfg/projects/Komikku.json
@@ -0,0 +1,11 @@
+{
+    "project": "Komikku",
+    "license": "Apache-2.0",
+    "projectweb": "https://github.com/komikku-app/komikku",
+    "fileset": {
+        "Komikku": {
+            "url": "https://github.com/komikku-app/komikku.git",
+            "type": "git"
+        }
+    }
+}
diff --git a/src/builder/convertfiles.py b/src/builder/convertfiles.py
index 6f9c55dd..87f2a594 100644
--- a/src/builder/convertfiles.py
+++ b/src/builder/convertfiles.py
@@ -254,6 +254,12 @@ def _convert_android_resources_files_to_po(self):
                     if os.path.exists(src) and os.path.exists(tgt):
                         self._convert_android_file(src, tgt, dir)
 
+                # MOKO resources structure: base/strings.xml + ca/strings.xml
+                moko_src = os.path.join(dir, "base/strings.xml")
+                moko_tgt = os.path.join(dir, "ca/strings.xml")
+                if os.path.exists(moko_src) and os.path.exists(moko_tgt):
+                    self._convert_android_file(moko_src, moko_tgt, dir)
+
         logging.info("convert Android directory: {0}".format(self.convert_dir))
 
     def _convert_json_file_to_po(self, jsonfile, source, target):
diff --git a/src/tests/builder-tests/data/conversions/moko/moko-resources/base/strings.xml b/src/tests/builder-tests/data/conversions/moko/moko-resources/base/strings.xml
new file mode 100644
index 00000000..3e63cce6
--- /dev/null
+++ b/src/tests/builder-tests/data/conversions/moko/moko-resources/base/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_search">Search</string>
+    <string name="action_hide">Hide</string>
+    <string name="action_open_folder">Open folder</string>
+</resources>
diff --git a/src/tests/builder-tests/data/conversions/moko/moko-resources/ca/strings.xml b/src/tests/builder-tests/data/conversions/moko/moko-resources/ca/strings.xml
new file mode 100644
index 00000000..b4b341db
--- /dev/null
+++ b/src/tests/builder-tests/data/conversions/moko/moko-resources/ca/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_search">Cercar</string>
+    <string name="action_hide">Amagar</string>
+    <string name="action_open_folder">Obre la carpeta</string>
+</resources>
diff --git a/src/tests/builder-tests/testconvertfiles.py b/src/tests/builder-tests/testconvertfiles.py
index f8062e60..06317d57 100644
--- a/src/tests/builder-tests/testconvertfiles.py
+++ b/src/tests/builder-tests/testconvertfiles.py
@@ -155,6 +155,19 @@ def test_convert_android_files_to_po(self):
         self.assertEqual("Name is too long", po_file[14].msgid)
         self.assertEqual("El nom és massa llarg", po_file[14].msgstr)
 
+    def test_convert_moko_files_to_po(self):
+        moko_dir = path.dirname(path.realpath(__file__))
+        moko_dir += "/data/conversions/moko/"
+        convert = ConvertFiles(moko_dir, None)
+        convert.convert()
+
+        po_file, entries = self._get_po_entries(moko_dir)
+        self._clean_pos(moko_dir)
+
+        self.assertEqual(entries, 3)
+        self.assertEqual("Search", po_file[0].msgid)
+        self.assertEqual("Cercar", po_file[0].msgstr)
+
     def test_convert_xliff_file_to_po(self):
         xliff_dir = path.dirname(path.realpath(__file__))
         xliff_dir += "/data/conversions/xliff"