diff --git a/ChangeLog b/ChangeLog
index 8f47a6a1f..320ff5986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Roland Illig  <roland.illig@gmx.de>
+
+	* syntax/Makefile.am: Don't install syntax highlighting files if
+	the internal editor is disabled.
+
 2004-12-03  Pavel S. Shirshov  <me@pavelsh.pp.ru>
 
 	* configure.ac: Bump version to 4.6.1a
diff --git a/syntax/Makefile.am b/syntax/Makefile.am
index 298a12574..e1d0027ec 100644
--- a/syntax/Makefile.am
+++ b/syntax/Makefile.am
@@ -1,6 +1,4 @@
-syntaxdir = $(pkgdatadir)/syntax
-
-syntax_DATA =			\
+SYNTAXFILES =			\
 	Syntax			\
 	ada95.syntax		\
 	aspx.syntax		\
@@ -41,4 +39,9 @@ syntax_DATA =			\
 	unknown.syntax		\
 	xml.syntax
 
-EXTRA_DIST = $(syntax_DATA)
+if USE_EDIT
+syntaxdir =		$(pkgdatadir)/syntax
+syntax_DATA =		$(SYNTAXFILES)
+endif
+
+EXTRA_DIST =		$(SYNTAXFILES)