diff --git a/syntax/Makefile.am b/syntax/Makefile.am
index 446b1623..dd205fbd 100644
--- a/syntax/Makefile.am
+++ b/syntax/Makefile.am
@@ -8,7 +8,6 @@ pkgdata_DATA =	asm.nanorc \
 		default.nanorc \
 		elisp.nanorc \
 		email.nanorc \
-		fortran.nanorc \
 		go.nanorc \
 		groff.nanorc \
 		guile.nanorc \
@@ -30,7 +29,6 @@ pkgdata_DATA =	asm.nanorc \
 		php.nanorc \
 		po.nanorc \
 		postgresql.nanorc \
-		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		rust.nanorc \
@@ -42,7 +40,10 @@ pkgdata_DATA =	asm.nanorc \
 
 nobase_pkgdata_DATA = \
 		extra/debian.nanorc \
+		extra/fortran.nanorc \
 		extra/gentoo.nanorc \
+		extra/haskell.nanorc \
+		extra/povray.nanorc \
 		extra/spec.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA) $(nobase_pkgdata_DATA)
diff --git a/syntax/fortran.nanorc b/syntax/extra/fortran.nanorc
similarity index 100%
rename from syntax/fortran.nanorc
rename to syntax/extra/fortran.nanorc
diff --git a/syntax/pov.nanorc b/syntax/extra/povray.nanorc
similarity index 100%
rename from syntax/pov.nanorc
rename to syntax/extra/povray.nanorc