diff --git a/ChangeLog b/ChangeLog
index 8edd07645..e2442f4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
+
+	* backend/snapscan-mutex.c: Fixed compilation problem on OS/2
+	  (Thanks to Franz Bakan).
+	* configure.in configure: SnapScan backend now compiled in by 
+	  default on OS/2
+      
 2004-04-15  Marian Eichholz <eichholz@computer.org>
 
 	* backend/sm3600.h backend/sm3600-scanmtek.c
diff --git a/backend/snapscan-mutex.c b/backend/snapscan-mutex.c
index 0c78c46f3..1f7dbdd60 100644
--- a/backend/snapscan-mutex.c
+++ b/backend/snapscan-mutex.c
@@ -39,7 +39,7 @@
   whether to permit this exception to apply to your modifications.
   If you do not wish that, delete this exception notice.*/
   
-#if defined USE_PTHREAD
+#if defined USE_PTHREAD || defined HAVE_OS2_H
 
 #include <pthread.h>
 #define snapscan_mutex_t pthread_mutex_t
@@ -65,7 +65,7 @@ static void snapscani_mutex_unlock(snapscan_mutex_t* sem_id)
     pthread_mutex_unlock(sem_id);
 }
 
-#else /* defined USE_PTHREAD */
+#else /* defined USE_PTHREAD || defined HAVE_OS2_H */
 
 #include <sys/ipc.h>
 #include <sys/sem.h>
@@ -115,4 +115,4 @@ static void snapscani_mutex_unlock(snapscan_mutex_t* sem_id)
     semop(*sem_id, &sem_signal, 1);
 }
 
-#endif /* defined USE_PTHREAD */
+#endif /* defined USE_PTHREAD || defined HAVE_OS2_H */
diff --git a/configure b/configure
index c5407e0a9..c8a8fdb15 100755
--- a/configure
+++ b/configure
@@ -23873,7 +23873,7 @@ echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
           microtek2 mustek mustek_pp mustek_usb nec pie plustek \
           plustek_pp ricoh s9036 sceptre sharp \
           sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
-          artec_eplus48u ma1509 ibm hp5400 u12"
+          artec_eplus48u ma1509 ibm hp5400 u12 snapscan"
 
   if test "${sane_cv_use_libjpeg}" != "yes"; then
     echo "*** disabling DC210 backend (failed to find JPEG library)"
@@ -23928,12 +23928,6 @@ echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
     BACKENDS="${BACKENDS} net"
   fi
 
-  if test "${ac_cv_header_sys_sem_h}" = "no" ; then
-    echo "*** disabling snapscan backend (sys/sem.h not found)"
-  else
-    BACKENDS="${BACKENDS} snapscan"
-  fi
-
   # Check whether --enable-pnm-backend or --disable-pnm-backend was given.
 if test "${enable_pnm_backend+set}" = set; then
   enableval="$enable_pnm_backend"
diff --git a/configure.in b/configure.in
index 6b48bddd5..7f65daf8e 100644
--- a/configure.in
+++ b/configure.in
@@ -289,7 +289,7 @@ else
           microtek2 mustek mustek_pp mustek_usb nec pie plustek \
           plustek_pp ricoh s9036 sceptre sharp \
           sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
-          artec_eplus48u ma1509 ibm hp5400 u12"
+          artec_eplus48u ma1509 ibm hp5400 u12 snapscan"
 
   if test "${sane_cv_use_libjpeg}" != "yes"; then
     echo "*** disabling DC210 backend (failed to find JPEG library)"
@@ -344,12 +344,6 @@ else
     BACKENDS="${BACKENDS} net"
   fi
 
-  if test "${ac_cv_header_sys_sem_h}" = "no" ; then
-    echo "*** disabling snapscan backend (sys/sem.h not found)"
-  else
-    BACKENDS="${BACKENDS} snapscan"
-  fi
-
   AC_ARG_ENABLE(pnm-backend, 
     AC_HELP_STRING([--enable-pnm-backend],
                    [enable the pnm backend for testing frontends (possible