diff -ur bbmail-0.9.3.orig/configure.ac bbmail-0.9.3/configure.ac
--- bbmail-0.9.3.orig/configure.ac	2007-12-03 23:04:11.000000000 +0200
+++ bbmail-0.9.3/configure.ac	2009-07-30 19:24:12.000000000 +0300
@@ -9,13 +9,11 @@
 AC_DEFUN(AC_SET_DEBUG,
 [
  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
- test "$LDFLAGS" = "" && LDFLAGS=""
 ])
 
 AC_DEFUN(AC_SET_NODEBUG,
 [
- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
- test "$LDFLAGS" = "" && LDFLAGS="-s"
+ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
 ])
       
 
@@ -46,9 +44,9 @@
 
 CFLAGS="$CFLAGS $X_CFLAGS"
 CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+LIBS="$X_LIBS $X_PRE_LIBS"
 dnl Checks for X libraries.
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
 
 dnl Checks for Xextension
diff -ur bbmail-0.9.3.orig/src/bbmail.cpp bbmail-0.9.3/src/bbmail.cpp
--- bbmail-0.9.3.orig/src/bbmail.cpp	2007-12-03 23:08:26.000000000 +0200
+++ bbmail-0.9.3/src/bbmail.cpp	2009-07-30 19:20:10.000000000 +0300
@@ -19,6 +19,8 @@
 // (See the included file COPYING / GPL-2.0)
 //
 
+#include <cstdio>
+
 #include "bbmail.h"
 #include "config.h"
 #include <string>
diff -ur bbmail-0.9.3.orig/src/mailboxmenu.cpp bbmail-0.9.3/src/mailboxmenu.cpp
--- bbmail-0.9.3.orig/src/mailboxmenu.cpp	2005-02-01 00:03:37.000000000 +0200
+++ bbmail-0.9.3/src/mailboxmenu.cpp	2009-07-30 19:20:39.000000000 +0300
@@ -19,6 +19,9 @@
 // (See the included file COPYING / GPL-2.0)
 //
 //
+
+#include <cstdio>
+
 #include "mailboxmenu.h"
 
 MailboxMenu::MailboxMenu(ToolWindow *toolwindow) :
diff -ur bbmail-0.9.3.orig/src/main.cpp bbmail-0.9.3/src/main.cpp
--- bbmail-0.9.3.orig/src/main.cpp	2006-01-20 23:28:08.000000000 +0200
+++ bbmail-0.9.3/src/main.cpp	2009-07-30 19:19:49.000000000 +0300
@@ -19,6 +19,8 @@
 // (See the included file COPYING / GPL-2.0)
 //
 
+#include <cstdio>
+
 #include "bbmail.h"
 #include "main.h"
 #include "config.h"
diff -ur bbmail-0.9.3.orig/src/Makefile.am bbmail-0.9.3/src/Makefile.am
--- bbmail-0.9.3.orig/src/Makefile.am	2005-09-06 23:57:42.000000000 +0300
+++ bbmail-0.9.3/src/Makefile.am	2009-07-30 19:24:39.000000000 +0300
@@ -10,5 +10,4 @@
 		 spoollist.cpp spoollist.h \
 		 mailboxmenu.cpp mailboxmenu.h \
 		 blackboxstyle.h
-bbmail_LDADD = @X_LIBS@
-
+bbmail_LDADD = @LIBS@
diff -ur bbmail-0.9.3.orig/src/resource.cpp bbmail-0.9.3/src/resource.cpp
--- bbmail-0.9.3.orig/src/resource.cpp	2007-08-28 19:47:19.000000000 +0300
+++ bbmail-0.9.3/src/resource.cpp	2009-07-30 19:20:00.000000000 +0300
@@ -19,6 +19,8 @@
 // (See the included file COPYING / GPL-2.0)
 //
 
+#include <cstdio>
+
 #include "bbmail.h"
 #include "resource.h"
 #include "blackboxstyle.h"