diff --git a/lib/base/defer.hpp b/lib/base/defer.hpp
new file mode 100644
index 000000000..9290c92b9
--- /dev/null
+++ b/lib/base/defer.hpp
@@ -0,0 +1,46 @@
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
+
+#ifndef DEFER
+#define DEFER
+
+#include <functional>
+#include <utility>
+
+namespace icinga
+{
+
+/**
+ * An action to be executed at end of scope.
+ *
+ * @ingroup base
+ */
+class Defer
+{
+public:
+	inline
+	Defer(std::function<void()> func) : m_Func(std::move(func))
+	{
+	}
+
+	Defer(const Defer&) = delete;
+	Defer(Defer&&) = delete;
+	Defer& operator=(const Defer&) = delete;
+	Defer& operator=(Defer&&) = delete;
+
+	inline
+	~Defer()
+	{
+		try {
+			m_Func();
+		} catch (...) {
+			// https://stackoverflow.com/questions/130117/throwing-exceptions-out-of-a-destructor
+		}
+	}
+
+private:
+	std::function<void()> m_Func;
+};
+
+}
+
+#endif /* DEFER */