diff --git a/patacrep/data/templates/layout.tex b/patacrep/data/templates/layout.tex
index 099772a4..135aba1b 100644
--- a/patacrep/data/templates/layout.tex
+++ b/patacrep/data/templates/layout.tex
@@ -27,9 +27,14 @@
 
 \makeatletter
 \def\input@path{ %
+    % include .sty folders
     (* for dir in datadir *)
         {(( path2posix(dir) ))/latex/} %
     (* endfor *)
+    % include datadir folders (for \import)
+    (* for dir in datadir *)
+        {(( path2posix(dir) ))/} %
+    (* endfor *)
 }
 \makeatother
 
diff --git a/patacrep/songs/latex/__init__.py b/patacrep/songs/latex/__init__.py
index 29940f8b..86c72400 100644
--- a/patacrep/songs/latex/__init__.py
+++ b/patacrep/songs/latex/__init__.py
@@ -36,7 +36,7 @@ class Latex2LatexSong(Song):
             raise ValueError(self.datadir)
         path = files.path2posix(files.relpath(
             self.fullpath,
-            os.path.dirname(self.datadir)
+            self.datadir
         ))
         return r'\import{{{}/}}{{{}}}'.format(os.path.dirname(path), os.path.basename(path))