diff --git a/debian/changelog b/debian/changelog
index f0850ed..fd7fc1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rpiboot (20170926+2) stretch; urgency=medium
+
+  * Change rpiboot behaviour to check /usr/share/rpiboot/msd
+  * Add lintian-overrides
+
+ -- Serge Schneider <serge@raspberrypi.org>  Tue, 26 Sep 2017 16:11:13 +0100
+
 rpiboot (20170926+1) stretch; urgency=medium
 
   * Install msd files without creating a subdirectory
diff --git a/debian/rpiboot.install b/debian/rpiboot.install
index 0b36d5c..5df7802 100644
--- a/debian/rpiboot.install
+++ b/debian/rpiboot.install
@@ -1,2 +1,2 @@
 rpiboot usr/bin
-msd/* usr/share/rpiboot
+msd usr/share/rpiboot
diff --git a/debian/rpiboot.lintian-overrides b/debian/rpiboot.lintian-overrides
new file mode 100644
index 0000000..b569323
--- /dev/null
+++ b/debian/rpiboot.lintian-overrides
@@ -0,0 +1,5 @@
+rpiboot: binary-without-manpage usr/bin/rpiboot
+rpiboot: arch-dependent-file-in-usr-share usr/share/rpiboot/msd/start.elf
+rpiboot: binary-from-other-architecture usr/share/rpiboot/msd/start.elf
+rpiboot: unstripped-binary-or-object usr/share/rpiboot/msd/start.elf
+rpiboot: statically-linked-binary usr/share/rpiboot/msd/start.elf
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..a761576
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1 @@
+rpiboot: source-is-missing msd/start.elf
diff --git a/main.c b/main.c
index 333833c..e8e9b59 100755
--- a/main.c
+++ b/main.c
@@ -296,7 +296,7 @@ FILE * check_file(char * dir, char *fname)
 
 	if(fp == NULL)
 	{
-		strcpy(path, "/usr/share/rpiboot/");
+		strcpy(path, "/usr/share/rpiboot/msd/");
 		strcat(path, fname);
 		fp = fopen(path, "rb");
 	}
@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
 	second_stage = check_file(directory, "bootcode.bin");
 	if(second_stage == NULL)
 	{
-		fprintf(stderr, "Unable to open 'bootcode.bin' from /usr/share/rpiboot or supplied directory\n");
+		fprintf(stderr, "Unable to open 'bootcode.bin' from /usr/share/rpiboot/msd or supplied directory\n");
 		usage(1);
 	}