diff --git a/SConstruct b/SConstruct
index a2e0385c3..61cf14187 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1296,7 +1296,7 @@ if not preconfigured:
     # prepend to make sure we link locally
     env.Prepend(CPPPATH = '#deps/agg/include')
     env.Prepend(LIBPATH = '#deps/agg')
-
+    env.Prepend(CPPPATH = '#deps/clipper/include')
     # prepend deps dir for auxillary headers
     env.Prepend(CPPPATH = '#deps')
 
diff --git a/deps/clipper/build.py b/deps/clipper/build.py
new file mode 100644
index 000000000..1930ea554
--- /dev/null
+++ b/deps/clipper/build.py
@@ -0,0 +1,32 @@
+#  This file is part of Mapnik (c++ mapping toolkit)
+#  Copyright (C) 2013 Artem Pavlenko
+#
+#  Mapnik is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#
+
+import os
+from glob import glob
+
+Import('env')
+
+clipper_env = env.Clone()
+
+if env['SUNCC']:
+    cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O -KPIC -DNDEBUG'
+else:
+    cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
+
+clipper_env.StaticLibrary('clipper', ['./src/clipper.cpp',], LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])
diff --git a/deps/agg/include/clipper.hpp b/deps/clipper/include/clipper.hpp
similarity index 100%
rename from deps/agg/include/clipper.hpp
rename to deps/clipper/include/clipper.hpp
diff --git a/deps/agg/src/clipper.cpp b/deps/clipper/src/clipper.cpp
similarity index 100%
rename from deps/agg/src/clipper.cpp
rename to deps/clipper/src/clipper.cpp
diff --git a/deps/mapnik/build.py b/deps/mapnik/build.py
index 1767b5521..e2bbe21a5 100644
--- a/deps/mapnik/build.py
+++ b/deps/mapnik/build.py
@@ -6,7 +6,8 @@ Import('env')
 subdirs =  {
   'sparsehash':'sparsehash',
   'sparsehash/internal':'sparsehash/internal',
-  '../agg/include':'agg'
+  '../agg/include':'agg',
+  '../clipper/include':'agg'
 }
 
 if 'install' in COMMAND_LINE_TARGETS:
diff --git a/src/build.py b/src/build.py
index 563684559..487abfc10 100644
--- a/src/build.py
+++ b/src/build.py
@@ -231,6 +231,12 @@ source += Split(
     """
     )
 
+# clipper
+source += Split(
+    """
+     ../deps/clipper/src/clipper.cpp
+    """)
+
 if env['RUNTIME_LINK'] == "static":
     source += glob.glob('../deps/agg/src/' + '*.cpp')