diff --git a/Makefile b/Makefile
index f864017..51b163a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: dvdemu
 
 dvdemu: DVDEmu.cpp DVDEmu.h Serial.cpp Serial.h Video.cpp Video.h Toshiba_SD-B100.cpp Toshiba_SD-B100.h Victor_XV-D701.cpp Victor_XV-D701.h
-	g++ -Wall -Werror -D_BSD_SOURCE -pthread -lcurses -o dvdemu DVDEmu.cpp Serial.cpp Video.cpp Toshiba_SD-B100.cpp Victor_XV-D701.cpp -ggdb
+	g++ -Wall -Werror -D_BSD_SOURCE -pthread -ltinfo -lcurses -o dvdemu DVDEmu.cpp Serial.cpp Video.cpp Toshiba_SD-B100.cpp Victor_XV-D701.cpp -ggdb
 
 .DUMMY: clean
 clean:
diff --git a/Video.cpp b/Video.cpp
index 3c22895..0c4f620 100644
--- a/Video.cpp
+++ b/Video.cpp
@@ -111,7 +111,7 @@ void *VideoThread( void *state )
                          * Also accept any extension that we support.
                          */
                         char syscall[256];
-                        sprintf(syscall, "omxplayer -b --no-osd %s%02d.m4v > /dev/null 2> /dev/null &", private_state->dvd_path, arg);
+                        sprintf(syscall, "omxplayer --loop -b --no-osd %s%02d.m4v > /dev/null 2> /dev/null &", private_state->dvd_path, arg);
                         exec_shell(syscall);
                         /* Wait for it to start */
                         while( 1 )
@@ -133,6 +133,8 @@ void *VideoThread( void *state )
             usleep( 10000 );
         }
     }
+
+    return NULL;
 }
 
 void VideoThreadAction( unsigned int opcode, unsigned int argument )