Merge commit 'fml/master'

diff --combined Makefile
index 7e3d81d92ae73d96b663b116b0b40f35198b7531,fde1e3088c184977007f9d8680513a0f305ade69..53f4f963040ef54e6913bb6a75f4b175e9690748
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -107,7 -107,6 +107,6 @@@ ifeq ($(format),elf
        LDFLAGS += --shared
  endif
  
- 
  all: $(realname) $(executables) $(man_pages)
  Makefile.deps: $(wildcard *.c *.h)
        $(CC) -MM -MG *.c > $@
@@@ -174,7 -173,7 +173,7 @@@ install: al
        $(LN) -s $(libdir)/$(soname) $(libdir)/$(linkername)
        $(INSTALL) -s -m 755 $(realname) $(libdir)
        $(INSTALL) -m 644 $(headers) $(includedir)
 -      $(INSTALL) -m 644 $(executables) $(bindir)
 +      $(INSTALL) -m 755 $(executables) $(bindir)
        $(INSTALL) -m 644 $(man_pages) $(mandir)
  
  .PHONY: all clean install
@@@ -182,8 -181,8 +181,8 @@@
  web/%.1.html: %.1
        man2html $< > $@
  
- web/osl.png: web/osl.pdf
-       convert $< $@
+ web/osl.png: web/osl.pdf Makefile
+       convert -scale 200x200 $< $@
  
  web/index.html: web/oslfsck.1.html web/index.html.in INSTALL README
        sed -e '/@README@/,$$d' web/index.html.in > $@