diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index 3162c2f..eba4d31 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -226,6 +226,22 @@
       EmitAggExpr(Init, DeclPtr, D.getType().isVolatileQualified());
     }
   }
+
+  // Handle the cleanup attribute
+  if (const CleanupAttr *CA = D.getAttr<CleanupAttr>()) {
+    const FunctionDecl *FD = CA->getFunctionDecl();
+    
+    llvm::Constant* F = CGM.GetAddrOfFunction(FD);
+    assert(F && "Could not find function!");
+  
+    CleanupScope scope(*this);
+
+    CallArgList Args;
+    Args.push_back(std::make_pair(RValue::get(DeclPtr), 
+                                  getContext().getPointerType(D.getType())));
+      
+    EmitCall(CGM.getTypes().getFunctionInfo(FD), F, Args);
+  }
 }
 
 /// Emit an alloca (or GlobalValue depending on target)