diff --git a/.gitignore b/.gitignore
index 631139b4..ee03c6a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 elogd
 elconv
 elog
+*.o
diff --git a/Makefile b/Makefile
index 88d50712..31dd01cf 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ USE_KRB5   = 0
 #############################################################
 
 # Default compilation flags unless stated otherwise.
-CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations
+CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -Wno-unused-result -Wno-unused-but-set-variable
 #CFLAGS += -g -funroll-loops -fomit-frame-pointer -W -Wall
 
 CC = gcc
diff --git a/src/elogd.c b/src/elogd.c
index 277ba305..e74173cc 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -12245,7 +12245,7 @@ void adjust_crlf(char *buffer, int bufsize)
 #ifdef OS_UNIX
 
    /* convert \r\n -> \n */
-   bufsize = 0;                 // avoid compiler warning about unused bufsize
+   assert(bufsize);                 // avoid compiler warning about unused bufsize
    p = buffer;
    while ((p = strstr(p, "\r\n")) != NULL) {
       memmove(p, p + 1, strlen(p + 1) + 1);     // strcpy() gives error under Ubuntu
@@ -15241,7 +15241,7 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
        attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], *buffer;
    char *content, *p, boundary[80], request[10000], response[10000];
 #ifdef HAVE_SSL
-   SSL *ssl_con;
+   SSL *ssl_con = NULL;
 #endif
 
    text = (char *) xmalloc(TEXT_SIZE);
@@ -15630,7 +15630,7 @@ void submit_config(LOGBOOK * lbs, char *server, char *buffer, char *error_str)
    char subdir[256], param[256], remote_host_name[256];
    char *content, *p, boundary[80], request[10000], response[10000];
 #ifdef HAVE_SSL
-   SSL *ssl_con;
+   SSL *ssl_con = NULL;
 #endif
 
    error_str[0] = 0;
@@ -29882,7 +29882,8 @@ int main(int argc, char *argv[])
 
    /* initialize variables */
    smtp_pwd[0] = 0;
-   logbook[0] = clone_url[0] = logbook_dir[0] = resource_dir[0] = logbook_dir[0] = 0;
+   logbook_dir[0] = 0;
+   logbook[0] = clone_url[0] = resource_dir[0] = logbook_dir[0] = 0;
    silent = tcp_port_cl = sync_flag = 0;
    use_keepalive = TRUE;
    running_as_daemon = FALSE;
diff --git a/src/git-revision.h b/src/git-revision.h
index baf4cd0e..da0f0f6c 100644
--- a/src/git-revision.h
+++ b/src/git-revision.h
@@ -1,23 +1 @@
-/********************************************************************\
-
-  Name:         git-revision.h
-  Created by:   Stefan Ritt
-  Copyright 2000 + Stefan Ritt
-
-  ELOG is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  ELOG is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with ELOG.  If not, see <http://www.gnu.org/licenses/>.
-
-
-\********************************************************************/
-
-#define GIT_REVISION "Mon Jan 13 09:25:57 2014 +0100 - a738232"
+#define GIT_REVISION "Sun May 11 20:33:11 2014 +0200 - 44800a7"