diff -u -r a/configure.ac b/configure.ac
--- a/configure.ac	2017-11-19 12:45:42.000000001 +0300
+++ b/configure.ac	2018-01-28 01:06:06.343012268 +0300
@@ -96,6 +96,8 @@
 		[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"],
 		[])
 
+# Scintilla
+PKG_CHECK_MODULES([SCINTILLA], [scintilla-gtk3])
 
 # Check for binary relocation support
 GEANY_CHECK_BINRELOC
@@ -145,8 +147,6 @@
 		icons/tango/48x48/Makefile
 		icons/tango/scalable/Makefile
 		ctags/Makefile
-		scintilla/Makefile
-		scintilla/include/Makefile
 		src/Makefile
 		src/tagmanager/Makefile
 		plugins/Makefile
diff -u -r a/doc/Makefile.am b/doc/Makefile.am
--- a/doc/Makefile.am	2017-11-19 12:45:42.000000001 +0300
+++ b/doc/Makefile.am	2018-01-28 01:17:03.352729373 +0300
@@ -157,7 +157,6 @@
 uninstall-local:
 	rm -f $(DOCDIR)/html/index.html
 	rm -f $(DOCDIR)/manual.txt
-	rm -f $(DOCDIR)/ScintillaLicense.txt
 
 # manually install some files under another name
 install-data-local:
@@ -170,4 +169,3 @@
 endif
 	$(mkinstalldirs) $(DOCDIR)
 	$(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt
-	$(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
diff -u -r a/Makefile.am b/Makefile.am
--- a/Makefile.am	2017-11-19 12:45:42.000000001 +0300
+++ b/Makefile.am	2018-01-28 01:06:32.635786347 +0300
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = ctags scintilla src plugins icons po doc data tests
+SUBDIRS = ctags src plugins icons po doc data tests
 
 AUTOMAKE_OPTIONS =	1.7
 
diff -u -r a/plugins/Makefile.am b/plugins/Makefile.am
--- a/plugins/Makefile.am	2017-11-19 12:45:42.000000001 +0300
+++ b/plugins/Makefile.am	2018-01-28 01:17:40.519409678 +0300
@@ -74,7 +74,7 @@
 	-DGTK \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/tagmanager \
-	-I$(top_srcdir)/scintilla/include \
+	@SCINTILLA_CFLAGS@ \
 	$(GTK_CFLAGS) \
 	$(PLUGIN_CFLAGS)
 
diff -u -r a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am	2017-11-19 12:45:42.000000001 +0300
+++ b/src/Makefile.am	2018-01-28 01:07:20.709225447 +0300
@@ -14,7 +14,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/scintilla/include \
+	@SCINTILLA_CFLAGS@ \
 	-I$(srcdir)/tagmanager \
 	-DGTK \
 	-DGEANY_PRIVATE \
@@ -119,7 +119,7 @@
 libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@
 
 libgeany_la_LIBADD = \
-	$(top_builddir)/scintilla/libscintilla.la \
+	@SCINTILLA_LIBS@ \
 	$(builddir)/tagmanager/libtagmanager.la \
 	@GTK_LIBS@ \
 	@GTHREAD_LIBS@ \