diff --git a/server/Makefile b/server/Makefile
index 7050d00..05ce50b 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -28,8 +28,8 @@ endif
 
 GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h
 
-PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0`
-PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
+PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0)
+PKG_LIB := $(shell $(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0)
 
 FLAGS = -O2 $(PKG_INCLUDE)
 
diff --git a/server/gkrellmd-private.h b/server/gkrellmd-private.h
index efebadb..f5a229a 100644
--- a/server/gkrellmd-private.h
+++ b/server/gkrellmd-private.h
@@ -43,10 +43,8 @@
 #endif
 
 #if defined(__linux__)
-#if defined(__GLIBC__) && ((__GLIBC__>2)||(__GLIBC__==2 && __GLIBC_MINOR__>=1))
 #define HAVE_GETADDRINFO	1
 #endif
-#endif
 
 #if defined(__DragonFly__)
 #define HAVE_GETADDRINFO	1
diff --git a/src/Makefile b/src/Makefile
index 3e67bbd..2d53139 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,8 +44,8 @@ endif
 
 GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
 
-PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gmodule-2.0 gthread-2.0`
-PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
+PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gmodule-2.0 gthread-2.0)
+PKG_LIB := $(shell $(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0)
 
 FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
  ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
diff --git a/src/client.c b/src/client.c
index 1ff0acb..00374d0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -55,10 +55,8 @@
 
 
 #if defined(__linux__)
-#if defined(__GLIBC__) && ((__GLIBC__>2)||(__GLIBC__==2 && __GLIBC_MINOR__>=1))
 #define HAVE_GETADDRINFO	1
 #endif
-#endif
 
 #if defined(__DragonFly__)
 #define HAVE_GETADDRINFO	1