=== modified file 'INSTALL'
--- INSTALL	2016-02-28 03:01:43 +0000
+++ INSTALL	2016-02-28 20:26:27 +0000
@@ -56,6 +56,7 @@
     python-urwid pkg-config fping ssh-client
     
 *** Mandos Client
+    + GNU C Library 2.16 https://gnu.org/software/libc/
     + initramfs-tools 0.85i
                         https://tracker.debian.org/pkg/initramfs-tools
     + GnuTLS 3.3        http://www.gnutls.org/

=== modified file 'plugin-runner.c'
--- plugin-runner.c	2016-02-28 14:22:10 +0000
+++ plugin-runner.c	2016-02-28 20:26:27 +0000
@@ -891,18 +891,8 @@
     return 1;
   }
   
-#ifdef __GLIBC__
-#if __GLIBC_PREREQ(2, 15)
   int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
 			     alphasort);
-#else  /* not __GLIBC_PREREQ(2, 15) */
-  int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
-			   &direntries, good_name, alphasort);
-#endif	/* not __GLIBC_PREREQ(2, 15) */
-#else	/* not __GLIBC__ */
-  int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
-			   &direntries, good_name, alphasort);
-#endif	/* not __GLIBC__ */
   if(numplugins == -1){
     error(0, errno, "Could not scan plugin dir");
     direntries = NULL;
@@ -1114,20 +1104,7 @@
       goto fallback;
     }
     
-#if defined (__GNUC__) and defined (__GLIBC__)
-#if not __GLIBC_PREREQ(2, 16)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-#endif
-    FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
-					  -Wconversion in GNU libc
-					  before 2.16 */
-#if defined (__GNUC__) and defined (__GLIBC__)
-#if not __GLIBC_PREREQ(2, 16)
-#pragma GCC diagnostic pop
-#endif
-#endif
+    FD_SET(new_plugin->fd, &rfds_all);
     
     if(maxfd < new_plugin->fd){
       maxfd = new_plugin->fd;
@@ -1189,20 +1166,7 @@
 	  }
 	  
 	  /* Remove the plugin */
-#if defined (__GNUC__) and defined (__GLIBC__)
-#if not __GLIBC_PREREQ(2, 16)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-#endif
-	  FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
-					  -Wconversion in GNU libc
-					  before 2.16 */
-#if defined (__GNUC__) and defined (__GLIBC__)
-#if not __GLIBC_PREREQ(2, 16)
-#pragma GCC diagnostic pop
-#endif
-#endif
+	  FD_CLR(proc->fd, &rfds_all);
 	  
 	  /* Block signal while modifying process_list */
 	  ret = (int)TEMP_FAILURE_RETRY(sigprocmask
@@ -1248,23 +1212,7 @@
       }
       
       /* This process has not completed.  Does it have any output? */
-#if defined (__GNUC__) and defined (__GLIBC__)
-#if not __GLIBC_PREREQ(2, 16)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-#endif
-      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
-							 warning from
-							 -Wconversion
-							 in GNU libc
-							 before
-							 2.16 */
-#if defined (__GNUC__) and defined (__GLIBC__)
-#if not __GLIBC_PREREQ(2, 16)
-#pragma GCC diagnostic pop
-#endif
-#endif
+      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
 	/* This process had nothing to say at this time */
 	proc = proc->next;
 	continue;

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2016-02-28 14:22:10 +0000
+++ plugins.d/mandos-client.c	2016-02-28 20:26:27 +0000
@@ -1914,18 +1914,8 @@
       return;
     }
   }
-#ifdef __GLIBC__
-#if __GLIBC_PREREQ(2, 15)
   int numhooks = scandirat(hookdir_fd, ".", &direntries,
 			   runnable_hook, alphasort);
-#else  /* not __GLIBC_PREREQ(2, 15) */
-  int numhooks = scandir(hookdir, &direntries, runnable_hook,
-			 alphasort);
-#endif	/* not __GLIBC_PREREQ(2, 15) */
-#else	/* not __GLIBC__ */
-  int numhooks = scandir(hookdir, &direntries, runnable_hook,
-			 alphasort);
-#endif	/* not __GLIBC__ */
   if(numhooks == -1){
     perror_plus("scandir");
     return;
@@ -3054,18 +3044,8 @@
     if(tempdir_fd == -1){
       perror_plus("open");
     } else {
-#ifdef __GLIBC__
-#if __GLIBC_PREREQ(2, 15)
       int numentries = scandirat(tempdir_fd, ".", &direntries,
 				 notdotentries, alphasort);
-#else  /* not __GLIBC_PREREQ(2, 15) */
-      int numentries = scandir(tempdir, &direntries, notdotentries,
-			       alphasort);
-#endif	/* not __GLIBC_PREREQ(2, 15) */
-#else	/* not __GLIBC__ */
-      int numentries = scandir(tempdir, &direntries, notdotentries,
-			       alphasort);
-#endif	/* not __GLIBC__ */
       if(numentries >= 0){
 	for(int i = 0; i < numentries; i++){
 	  ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);