Index: src/monoclr/Makefile
===================================================================
--- src/monoclr/Makefile	(revision 137)
+++ src/monoclr/Makefile	(working copy)
@@ -11,17 +11,23 @@
 endif
 
 
-PY_LIBS = $(shell $(PYTHON) -c "from distutils.sysconfig import get_config_vars; \
-    print get_config_vars('BLDLIBRARY')[0]") #-lpython
-PY_CFLAGS = -I$(shell $(PYTHON) -c "from distutils.sysconfig import get_config_vars; \
-    print get_config_vars('CFLAGS')[0] + ' -I' + get_config_vars('CONFINCLUDEPY')[0]")
+#PY_LIBS = $(shell $(PYTHON) -c "from distutils.sysconfig import get_config_vars; \
+#    print get_config_vars('BLDLIBRARY')[0]") #-lpython
+#PY_CFLAGS = -I$(shell $(PYTHON) -c "from distutils.sysconfig import get_config_vars; \
+#    print get_config_vars('CFLAGS')[0] + ' -I' + get_config_vars('CONFINCLUDEPY')[0]")
 
-MONO_LIBS = $(shell pkg-config --libs mono)		# Was --libs mono
-MONO_CFLAGS = $(shell pkg-config --cflags mono)	# Was --cflags mono
+PY_LIBS = $(shell pkg-config --libs python)
+PY_CFLAGS = $(shell pkg-config --cflags python)
 
-LIBS = $(MONO_LIBS) $(PY_LIBS)
-CFLAGS = $(MONO_CFLAGS) $(PY_CFLAGS)
+MONO_LIBS = $(shell pkg-config --libs mono-2)		# Was --libs mono
+MONO_CFLAGS = $(shell pkg-config --cflags mono-2)	# Was --cflags mono
 
+GLIB_LIBS = $(shell pkg-config --libs glib-2.0)
+GLIB_CFLAGS = $(shell pkg-config --cflags glib-2.0)
+
+LIBS = $(MONO_LIBS) $(GLIB_LIBS) $(PY_LIBS)
+CFLAGS = $(MONO_CFLAGS) $(GLIB_CFLAGS) $(PY_CFLAGS)
+
 all: clr$(BASENAME) $(BASENAME) clr.so
 
 clrmod.o: pynetclr.h clrmod.c
Index: setup.py
===================================================================
--- setup.py	(revision 137)
+++ setup.py	(working copy)
@@ -25,7 +25,8 @@
     XXX cmd = "export PKG_CONFIG_PATH=/opt/mono-2.8/lib/pkgconfig:... early 2011
     """
     flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
-    cmd = "export PKG_CONFIG_PATH=/lib/pkgconfig; pkg-config --libs --cflags %s" % ' '.join(packages)
+    #cmd = "export PKG_CONFIG_PATH=/lib/pkgconfig; pkg-config --libs --cflags %s" % ' '.join(packages)
+    cmd = "pkg-config --libs --cflags %s" % ' '.join(packages)
     popen = subprocess.Popen(cmd, shell=True, close_fds=True, stdout=subprocess.PIPE)
     popen.wait()
     if popen.returncode != 0:
@@ -58,4 +59,4 @@
 setup(name="clr",
     ext_modules = extensions,
     scripts = ["src/monoclr/clrpython%s" % VERSION],
-    )
\ No newline at end of file
+    )
Index: Makefile
===================================================================
--- Makefile	(revision 137)
+++ Makefile	(working copy)
@@ -18,6 +18,7 @@
 INSTALL=/usr/bin/install -m644
 # Contributed by VIKAS DHIMAN -  - Thanks, Vikas!
 ARCH_FULL = $(shell uname -m)
+UNAME = $(shell uname)
 ifneq (, $(findstring 86, $(ARCH_FULL)))
 	ARCH = x86
 else