diff --git a/veejay-current/veejay-server/veejay/veejay.c b/veejay-current/veejay-server/veejay/veejay.c
index 59b3073d..f2ec26fd 100644
--- a/veejay-current/veejay-server/veejay/veejay.c
+++ b/veejay-current/veejay-server/veejay/veejay.c
@@ -61,6 +61,46 @@ static int live =0;
 static void CompiledWith()
 {
 	veejay_msg(VEEJAY_MSG_INFO,"Compilation flags:");
+#ifdef ARCH_MIPS
+	veejay_msg(VEEJAY_MSG_INFO, "\tCompiled for MIPS");
+#endif
+#ifdef ARCH_PPC
+	veejay_msg(VEEJAY_MSG_INFO, "\tCompiled for PPC");
+#endif
+#ifdef ARCH_X86_64
+	veejay_msg(VEEJAY_MSG_INFO, "\tCompiled for X86_64");
+#endif
+#ifdef ARCH_X86
+	veejay_msg(VEEJAY_MSG_INFO, "\tCompiled for X86");
+#endif
+#ifdef HAVE_DARWIN
+	veejay_msg(VEEJAY_MSG_INFO, "\tCompiled for Darwin");
+#endif
+#ifdef HAVE_PS2
+	veejay_msg(VEEJAY_MSG_INFO, "\tCompiled for Sony Playstation 2 (TM)");
+#endif
+#ifdef HAVE_ALTIVEC
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing Altivec");
+#endif
+#ifdef HAVE_ASM_SSE
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing SSE instruction set");
+#endif
+#ifdef HAVE_CMOV
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing CMOV");
+#endif
+#ifdef HAVE_ASM_SSE2
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing SSE2 instruction set");
+#endif
+#ifdef HAVE_ASM_MMX
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing MMX instruction set");
+#endif
+#ifdef HAVE_ASM_MMX2	
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing MMX2 instruction set");
+#endif
+#ifdef HAVE_ASM_3DNOW
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing 3Dnow instruction set");
+#endif
+
 #ifdef USE_GDK_PIXBUF
 	veejay_msg(VEEJAY_MSG_INFO,"\tUse GDK Pixbuf");
 #endif
@@ -84,6 +124,16 @@ static void CompiledWith()
 #ifdef HAVE_SDL
 	veejay_msg(VEEJAY_MSG_INFO,"\tUsing Simple Direct Media Layer");
 #endif
+#ifdef HAVE_JPEG
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing libjpeg");
+#endif
+#ifdef HAVE_LIBPTHREAD
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing libpthread");
+#endif
+#ifdef HAVE_V4L
+	veejay_msg(VEEJAY_MSG_INFO,"\tUsing Video4Linux");
+#endif
+
 	/*
 #ifdef HAVE_GL
 	veejay_msg( VEEJAY_MSG_INFO,  "\tUsing  openGL ");
@@ -91,36 +141,6 @@ static void CompiledWith()
 	*/
 #ifdef HAVE_DIRECTFB
 	veejay_msg(VEEJAY_MSG_INFO,"\tUsing DirectFB");
-#endif
-#ifdef ARCH_X86_64
-	veejay_msg(VEEJAY_MSG_INFO,"\tCompiled for x86-64 architecture");
-#endif
-#ifdef HAVE_X86CPU
-	veejay_msg(VEEJAY_MSG_INFO,"\tCompiled for x86 architecture");
-#endif
-#ifdef HAVE_PPCCPU
-	veejay_msg(VEEJAY_MSG_INFO,"\tCompiled for PPC architecture");
-#endif
-#ifdef HAVE_ALTIVEC
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing Altivec");
-#endif
-#ifdef HAVE_ASM_SSE
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing SSE instruction set");
-#endif
-#ifdef HAVE_CMOV
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing CMOV");
-#endif
-#ifdef HAVE_ASM_SSE2
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing SSE2 instruction set");
-#endif
-#ifdef HAVE_ASM_MMX
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing MMX instruction set");
-#endif
-#ifdef HAVE_ASM_MMX2	
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing MMX2 instruction set");
-#endif
-#ifdef HAVE_ASM_3DNOW
-	veejay_msg(VEEJAY_MSG_INFO,"\tUsing 3Dnow instruction set");
 #endif
 	exit(0);
 }
@@ -505,12 +525,12 @@ static int check_command_line_options(int argc, char *argv[])
 #ifdef HAVE_GETOPT_LONG
     while ((n =
 	    getopt_long(argc, argv,
-			"o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:R:M:T:F:nILPVDugvdibjqe",
+			"o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:R:M:T:F:nILPVDugvBdibjqe",
 			long_options, &option_index)) != EOF)
 #else
     while ((n =
 	    getopt(argc, argv,
-		   	"o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:R:M:T:F:nILPVDugvdibjqe"
+		   	"o:G:O:a:H:s:c:t:j:l:p:m:h:w:x:y:r:f:Y:A:N:H:W:R:M:T:F:nILPVDugvBdibjqe"
 						   )) != EOF)
 #endif
     {