diff --git a/Makefile.in b/Makefile.in
index 7bd51bc0..e99cb5b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,16 +1,16 @@
-CXX      = @CXX@
-CXXFLAGS = @CXXFLAGS@
-LDFLAGS  = @LDFLAGS@
-INCLUDES = @INCLUDES@
-LIBS     = @LIBS@
-prefix   = @prefix@
+CXX      := @CXX@
+CXXFLAGS := @CXXFLAGS@
+LDFLAGS  := @LDFLAGS@
+INCLUDES := @INCLUDES@
+LIBS     := @LIBS@
+prefix   := @prefix@
 
-SRCS = String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
+SRCS := String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
 	DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
 	FileUtils.cpp HTTPSock.cpp Template.cpp
-OBJS = $(patsubst %cpp,%o,$(SRCS))
-CLEAN = znc znc-static *.o core core.*
-DISTCLEAN = Makefile config.log config.status znc-config .depend \
+OBJS := $(patsubst %cpp,%o,$(SRCS))
+CLEAN := znc znc-static *.o core core.*
+DISTCLEAN := Makefile config.log config.status znc-config .depend \
 	modules/.depend modules/Makefile
 
 .PHONY: all modules clean distclean install depend
diff --git a/modules/Makefile.in b/modules/Makefile.in
index fa3bf4c4..b3d9aa73 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,35 +1,36 @@
-CXX      = @CXX@
-CXXFLAGS = @CXXFLAGS@
-LDFLAGS  = @LDFLAGS@
-INCLUDES = @INCLUDES@ -I..
-LIBS     = @LIBS@
-PERL     = @PERL@
-MODDIR   = @MODDIR@
-prefix   = @prefix@
-
-ifneq "$(PERL)" ""
-PERLCC   = -DHAVE_PERL `$(PERL) -MExtUtils::Embed -e perl_inc`
-PERLLD   = `$(PERL) -MExtUtils::Embed -e perl_inc -e ldopts`
-PERLHOOK = modperl_install
-else
-PERLHOOK =
-endif
+CXX      := @CXX@
+CXXFLAGS := @CXXFLAGS@
+LDFLAGS  := @LDFLAGS@
+INCLUDES := @INCLUDES@ -I..
+LIBS     := @LIBS@
+PERL     := @PERL@
+MODDIR   := @MODDIR@
+prefix   := @prefix@
 
 ifeq "@NOSSL@" "1" 
-FILES    = $(foreach file, $(wildcard *.cpp), \
+FILES    := $(foreach file, $(wildcard *.cpp), \
 	$(if $(shell grep REQUIRESSL $(file)), \
 		, \
 		$(basename $(file)) \
 	))
 else
-FILES    = $(basename $(wildcard *.cpp))
+FILES    := $(basename $(wildcard *.cpp))
 endif
 
-SRCS     = $(wildcard ../*.cpp) $(addsuffix .cpp, $(FILES))
-OBJS     = $(addsuffix .o, $(FILES))
-TARGETS  = $(addsuffix .so, $(FILES))
+ifneq "$(PERL)" ""
+PERLCC   := -DHAVE_PERL `$(PERL) -MExtUtils::Embed -e perl_inc`
+PERLLD   := `$(PERL) -MExtUtils::Embed -e perl_inc -e ldopts`
+PERLHOOK := modperl_install
+else
+PERLHOOK :=
+FILES    := $(shell echo $(FILES) | sed -e "s/modperl//")
+endif
 
-CLEAN    = *.so *.o
+SRCS     := $(wildcard ../*.cpp) $(addsuffix .cpp, $(FILES))
+OBJS     := $(addsuffix .o, $(FILES))
+TARGETS  := $(addsuffix .so, $(FILES))
+
+CLEAN    := *.so *.o
 
 .PHONY: all clean install depend modperl_install