diff --git a/ci/lint-check.txt b/ci/lint-check.txt
index 926577e62..bdfa74365 100644
--- a/ci/lint-check.txt
+++ b/ci/lint-check.txt
@@ -1,11 +1,32 @@
+# Files that lint.py should check
+
+*.bash
+*.bat
 *.c
+*.cc
+*.cmake
 *.cpp
+*.css
+*.gitignore
 *.h
+*.hh
 *.hpp
+*.in
+*.inc
 *.init
 *.init-example
+*.js
 *.lua
+*.manifest
+*.md
 *.mm
+*.pl
 *.proto
+*.py
 *.rb
 *.rst
+*.sh
+*.txt
+*.vbs
+*.yaml
+*.yml
diff --git a/ci/lint-ignore.txt b/ci/lint-ignore.txt
index c8c5fcd3e..ee68f67b8 100644
--- a/ci/lint-ignore.txt
+++ b/ci/lint-ignore.txt
@@ -1,8 +1,23 @@
-library/include/df/*
-plugins/stonesense/allegro/*
-plugins/isoworld/allegro/*
-plugins/isoworld/agui/*
-depends/*
+# Files that lint.py should ignore
+
 .git/*
-build*/*
+
+# Old files exempt from checks for now
+plugins/isoworld/*.txt
+plugins/raw/*.txt
+plugins/stonesense/*.txt
+plugins/stonesense/utilities/*
+
+# Generated files
 *.pb.h
+build*/*
+docs/_*
+docs/html/*
+docs/pdf/*
+library/include/df/*
+
+# Dependencies that we don't control
+depends/*
+plugins/isoworld/agui/*
+plugins/isoworld/allegro/*
+plugins/stonesense/allegro/*
diff --git a/package/windows/sdl license.txt b/package/windows/sdl license.txt
index e819febfb..4362b4915 100644
--- a/package/windows/sdl license.txt	
+++ b/package/windows/sdl license.txt	
@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -499,4 +499,4 @@ necessary.  Here is a sample; alter the names:
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
-That's all there is to it!
\ No newline at end of file
+That's all there is to it!
diff --git a/plugins/rendermax/CMakeLists.txt b/plugins/rendermax/CMakeLists.txt
index 651fb1e06..349bae13b 100644
--- a/plugins/rendermax/CMakeLists.txt
+++ b/plugins/rendermax/CMakeLists.txt
@@ -3,12 +3,12 @@ project(rendermax)
 # A list of source files
 set(PROJECT_SRCS
     rendermax.cpp
-	renderer_light.cpp
+    renderer_light.cpp
 )
 # A list of headers
 set(PROJECT_HDRS
     renderer_opengl.hpp
-	renderer_light.hpp
+    renderer_light.hpp
 )
 set_source_files_properties(${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
diff --git a/plugins/ruby/codegen.pl b/plugins/ruby/codegen.pl
index 535a49694..95d91c3ab 100755
--- a/plugins/ruby/codegen.pl
+++ b/plugins/ruby/codegen.pl
@@ -787,7 +787,7 @@ sub sizeof {
         } elsif ($subtype eq 'df-linked-list') {
             return 3 * $SIZEOF_PTR;
         } elsif ($subtype eq 'df-flagarray') {
-            return 2 * $SIZEOF_PTR;	# XXX length may be 4 on windows?
+            return 2 * $SIZEOF_PTR;    # XXX length may be 4 on windows?
         } elsif ($subtype eq 'df-static-flagarray') {
             return $field->getAttribute('count');
         } elsif ($subtype eq 'df-array') {