diff --git a/lang/feldspar/compiler/Makefile b/lang/feldspar/compiler/Makefile
index 847e99f8346..e722c82aa2d 100644
--- a/lang/feldspar/compiler/Makefile
+++ b/lang/feldspar/compiler/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2012/10/11 14:39:45 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.5 2012/10/31 19:23:33 kili Exp $
 
 COMMENT=                prototype compiler for the Feldspar DSL
 
-DISTNAME=               feldspar-compiler-0.4.0.2
-REVISION=		2
+DISTNAME=               feldspar-compiler-0.6.0.2
 
 WANTLIB +=		c m pthread util
 
@@ -11,10 +10,11 @@ MODULES+=		converters/libiconv
 
 BUILD_DEPENDS=          ${RUN_DEPENDS}
 RUN_DEPENDS=            devel/hs-MonadCatchIO-mtl \
-                        devel/hs-ansi-terminal \
+			devel/hs-ansi-terminal \
 			devel/hs-hint \
-                        devel/hs-mtl \
-                        lang/feldspar/language \
-			lang/hs-haskell-src-exts
+			devel/hs-mtl \
+			lang/feldspar/language>=0.6,<0.7 \
+			lang/hs-haskell-src-exts>=1.12 \
+			lang/hs-syntactic>=1.4,<1.5
 
 .include <bsd.port.mk>
diff --git a/lang/feldspar/compiler/distinfo b/lang/feldspar/compiler/distinfo
index a68e8ac6360..b90087a93fb 100644
--- a/lang/feldspar/compiler/distinfo
+++ b/lang/feldspar/compiler/distinfo
@@ -1,5 +1,2 @@
-MD5 (ghc/feldspar-compiler-0.4.0.2.tar.gz) = x9IOg3Zzb3Ej2rr3D2v66w==
-RMD160 (ghc/feldspar-compiler-0.4.0.2.tar.gz) = taCFyr1n9D+QK1fww7F7qmvKU3o=
-SHA1 (ghc/feldspar-compiler-0.4.0.2.tar.gz) = N//kFYA1nmOG+HSuWZVxeWSKR5U=
-SHA256 (ghc/feldspar-compiler-0.4.0.2.tar.gz) = hmkTtvmkVOMHYoeE6kS5jnRioxrElIwM5HwjqIHl4dA=
-SIZE (ghc/feldspar-compiler-0.4.0.2.tar.gz) = 59661
+SHA256 (ghc/feldspar-compiler-0.6.0.2.tar.gz) = JyauFmYZ8sJrJvpTqQXDE4J2Q2Z22MOAhr6XaCYDWaQ=
+SIZE (ghc/feldspar-compiler-0.6.0.2.tar.gz) = 75144
diff --git a/lang/feldspar/compiler/pkg/PLIST b/lang/feldspar/compiler/pkg/PLIST
index b06bf8705ca..bc384778f4d 100644
--- a/lang/feldspar/compiler/pkg/PLIST
+++ b/lang/feldspar/compiler/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/05/02 20:45:39 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/10/31 19:23:33 kili Exp $
 @bin bin/feldspar
 lib/ghc/${DISTNAME}/
 lib/ghc/${DISTNAME}/Feldspar/
@@ -11,28 +11,46 @@ lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Library.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Options.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Platforms.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/AllocationEliminator.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/BlockProgramHandler.hi
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/HandlePrimitives.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/Locator.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/PrettyPrint.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/Rule.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/TypeCorrector.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/TypeDefinitionGenerator.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Backend/C/Plugin/VariableRoleAssigner.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Compiler.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Error.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/CommandLine/
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/CommandLine/API/
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/CommandLine/API.hi
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/CommandLine/API/Constants.hi
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/CommandLine/API/Library.hi
-lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/CommandLine/API/Options.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/Interactive/
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Frontend/Interactive/Interface.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Array.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Binding.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Condition.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/ConditionM.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Error.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/FFI.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Future.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Interpretation.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Literal.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Loop.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Mutable.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/MutableToPure.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/NoInline.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Par.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Primitive.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Save.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/SizeProp.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/SourceInfo.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/FromCore/Tuple.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Frontend.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/CollectFreeVars.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/ConstantFolding.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/Free.hi
+lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/IVars.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/Naming.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Plugin/Unroll.hi
 lib/ghc/${DISTNAME}/Feldspar/Compiler/Imperative/Representation.hi
@@ -47,13 +65,16 @@ lib/ghc/${DISTNAME}/include/feldspar_array.c
 lib/ghc/${DISTNAME}/include/feldspar_array.h
 lib/ghc/${DISTNAME}/include/feldspar_c99.c
 lib/ghc/${DISTNAME}/include/feldspar_c99.h
+lib/ghc/${DISTNAME}/include/feldspar_future.h
 lib/ghc/${DISTNAME}/include/feldspar_tic64x.c
 lib/ghc/${DISTNAME}/include/feldspar_tic64x.h
+lib/ghc/${DISTNAME}/include/ivar.c
+lib/ghc/${DISTNAME}/include/ivar.h
+lib/ghc/${DISTNAME}/include/log.h
+lib/ghc/${DISTNAME}/include/taskpool.c
+lib/ghc/${DISTNAME}/include/taskpool.h
 lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
 lib/ghc/${DISTNAME}/register.sh
-@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
-@unexec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/unregister.sh -v0 --force
-lib/ghc/${DISTNAME}/unregister.sh
 share/doc/hs-${DISTNAME}/
 share/doc/hs-${DISTNAME}/LICENSE
 share/doc/hs-${DISTNAME}/html/
@@ -61,23 +82,41 @@ share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-CodeGeneration.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Library.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Options.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Platforms.html
-share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-AllocationEliminator.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-BlockProgramHandler.html
-share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-HandlePrimitives.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-Locator.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-PrettyPrint.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-Rule.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-TypeCorrector.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-TypeDefinitionGenerator.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Backend-C-Plugin-VariableRoleAssigner.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Compiler.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Error.html
-share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Frontend-CommandLine-API-Constants.html
-share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Frontend-CommandLine-API-Library.html
-share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Frontend-CommandLine-API-Options.html
-share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Frontend-CommandLine-API.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Frontend-Interactive-Interface.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Array.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Binding.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Condition.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-ConditionM.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Error.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-FFI.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Future.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Interpretation.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Literal.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Loop.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Mutable.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-MutableToPure.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-NoInline.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Par.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Primitive.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Save.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-SizeProp.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-SourceInfo.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore-Tuple.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-FromCore.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Frontend.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Plugin-CollectFreeVars.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Plugin-ConstantFolding.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Plugin-Free.html
+share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Plugin-IVars.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Plugin-Naming.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Plugin-Unroll.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Compiler-Imperative-Representation.html
@@ -86,6 +125,7 @@ share/doc/hs-${DISTNAME}/html/Feldspar-Compiler.html
 share/doc/hs-${DISTNAME}/html/Feldspar-NameExtractor.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Transformation-Framework.html
 share/doc/hs-${DISTNAME}/html/Feldspar-Transformation.html
+share/doc/hs-${DISTNAME}/html/doc-index-58.html
 share/doc/hs-${DISTNAME}/html/doc-index-A.html
 share/doc/hs-${DISTNAME}/html/doc-index-All.html
 share/doc/hs-${DISTNAME}/html/doc-index-B.html
@@ -119,23 +159,41 @@ share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-CodeGeneration.ht
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Library.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Options.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Platforms.html
-share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-AllocationEliminator.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-BlockProgramHandler.html
-share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-HandlePrimitives.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-Locator.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-PrettyPrint.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-Rule.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-TypeCorrector.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-TypeDefinitionGenerator.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Backend-C-Plugin-VariableRoleAssigner.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Compiler.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Error.html
-share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Frontend-CommandLine-API-Constants.html
-share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Frontend-CommandLine-API-Library.html
-share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Frontend-CommandLine-API-Options.html
-share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Frontend-CommandLine-API.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Frontend-Interactive-Interface.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Array.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Binding.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Condition.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-ConditionM.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Error.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-FFI.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Future.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Interpretation.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Literal.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Loop.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Mutable.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-MutableToPure.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-NoInline.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Par.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Primitive.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Save.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-SizeProp.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-SourceInfo.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore-Tuple.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-FromCore.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Frontend.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Plugin-CollectFreeVars.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Plugin-ConstantFolding.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Plugin-Free.html
+share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Plugin-IVars.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Plugin-Naming.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Plugin-Unroll.html
 share/doc/hs-${DISTNAME}/html/mini_Feldspar-Compiler-Imperative-Representation.html
@@ -148,3 +206,6 @@ share/doc/hs-${DISTNAME}/html/minus.gif
 share/doc/hs-${DISTNAME}/html/ocean.css
 share/doc/hs-${DISTNAME}/html/plus.gif
 share/doc/hs-${DISTNAME}/html/synopsis.png
+@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
+@unexec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/unregister.sh -v0 --force
+lib/ghc/${DISTNAME}/unregister.sh