diff --git a/ChangeLog b/ChangeLog
index 1debaae2f..754fdba92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
  * src/sci_cb.c, src/highlighting.c:
    Removed URL highlighting code(useless feature, never was enabled).
  * src/treeviews.c: Set policy settings for the scolledwindow.
+ * scintilla/License.txt, scintilla/Makefile.am, doc/Makefile.am:
+   Added Scintilla license file.
 
 
 2006-06-23  Nick Treleaven  <nick.treleaven@btinternet.com>
diff --git a/Makefile.am b/Makefile.am
index 07b54fb07..11b31a966 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = \
 	geany.glade \
 	geany.gladep \
 	data/global.tags \
-	data/global.tags \
+	data/php.tags \
 	data/latex.tags \
 	data/filetypes.*
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 658855e44..5f7eeff55 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,4 +52,5 @@ install-data-local: geany.txt htmldoc
 	$(INSTALL_DATA) ../COPYING $(DOCDIR)
 	$(INSTALL_DATA) ../AUTHORS $(DOCDIR)
 	$(INSTALL_DATA) ../TODO $(DOCDIR)
+	$(INSTALL_DATA) ../scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
 
diff --git a/scintilla/License.txt b/scintilla/License.txt
new file mode 100644
index 000000000..8d2861216
--- /dev/null
+++ b/scintilla/License.txt
@@ -0,0 +1,20 @@
+License for Scintilla and SciTE
+
+Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved 
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation. 
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
+OR PERFORMANCE OF THIS SOFTWARE. 
\ No newline at end of file
diff --git a/scintilla/Makefile.am b/scintilla/Makefile.am
index d4f291971..3b6d58327 100644
--- a/scintilla/Makefile.am
+++ b/scintilla/Makefile.am
@@ -67,4 +67,4 @@ marshallers: scintilla-marshal.list
 	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
 	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c
 
-EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h
+EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h License.txt