diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b7761e9..27677ed 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
 Version 1.0
 ----------------------------------------------------------------------
 2006-09-15:
+	+ minor tunes to src/Makefile
+	* fixed some bashisms in configure to make it work on fbsd
 	* closed issue #1, added --with-all to configure
 	* started using google-hosting for issuetracking
 	  (http://code.google.com/p/alock)
diff --git a/configure b/configure
index fda3bce..744931b 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-[[ -z $CC ]] && CC=gcc
-[[ -z $CFLAGS ]] && CFLAGS="-I/usr/X11R6/include"
-[[ -z $LDFLAGS ]] && LDFLAGS="-L/usr/X11R6/lib"
+[ -z $CC ] && CC=gcc
+[ -z $CFLAGS ] && CFLAGS="-I/usr/X11R6/include"
+[ -z $LDFLAGS ] && LDFLAGS="-L/usr/X11R6/lib"
 
 CHECK_XRENDER=0
 CHECK_XCURSOR=0
@@ -351,13 +351,13 @@ echo "" >&4
 check_docs
 check_xlib
 check_xlogo16
-[[ $CHECK_XPM == 1 ]] && check_xpm
-[[ $CHECK_XRENDER == 1 ]] && check_xrender
-[[ $CHECK_XCURSOR == 1 ]] && check_xcursor
-[[ $CHECK_IMLIB2 == 1 ]] && check_imlib2
-[[ $CHECK_PAM == 1 ]] && check_pam
-[[ $CHECK_PASSWD == 1 ]] && check_passwd
-[[ $CHECK_HASH == 1 ]] && check_hash
+[ "$CHECK_XPM" -eq 1 ] && check_xpm
+[ "$CHECK_XRENDER" -eq 1 ] && check_xrender
+[ "$CHECK_XCURSOR" -eq 1 ] && check_xcursor
+[ "$CHECK_IMLIB2" -eq 1 ] && check_imlib2
+[ "$CHECK_PAM" -eq 1 ] && check_pam
+[ "$CHECK_PASSWD" -eq 1 ] && check_passwd
+[ "$CHECK_HASH" -eq 1 ] && check_hash
 
 echo "#_______________________" >&4
 echo "" >&4
diff --git a/src/Makefile b/src/Makefile
index 89691b3..fc6df35 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,8 +47,8 @@ $(foreach module,$(MODULES),$(eval $(call funcAddModule,$(module))))
 #######################
 SOURCES = $(sort $(SRC))
 OBJECTS = $(SOURCES:.c=.o)
-DEPS = $(SOURCES:.c=.d)
-TARGET = alock
+DEPS    = $(foreach d,$(SOURCES), .$(d:.c=.d))
+TARGET  = alock
 #######################
 
 
@@ -67,8 +67,8 @@ distclean:
 
 deps: $(DEPS)
 
-%.d : %.c
-	$(MAKEDEP) -o $@ $<
+.%.d : %.c
+	$(MAKEDEP) $(CFLAGS) -o $@ $<
 
 #######################