diff --git a/include/transport/adhoccommand.h b/include/transport/adhoccommand.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9c1adfe9825d1c02c8fb42bfc18ee7cd32b3a6a
--- /dev/null
+++ b/include/transport/adhoccommand.h
@@ -0,0 +1,69 @@
+/**
+ * XMPP - libpurple transport
+ *
+ * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
+ * This program 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
+ * (at your option) 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#pragma once
+
+#include <string>
+#include <algorithm>
+#include <map>
+#include "Swiften/Swiften.h"
+
+namespace Transport {
+
+class Component;
+
+class AdHocCommand {
+	public:
+		/// Creates new AdHocManager.
+
+		/// \param component Transport instance associated with this AdHocManager.
+		AdHocCommand(Component *component, const Swift::JID &initiator, const Swift::JID &to);
+
+		/// Destructor.
+		virtual ~AdHocCommand();
+
+		virtual boost::shared_ptr<Swift::Command> handleRequest(boost::shared_ptr<Swift::Command> payload) = 0;
+
+		const std::string &getId() {
+			return m_id;
+		}
+
+		void refreshLastActivity() {
+			m_lastActivity = time(NULL);
+		}
+
+		time_t getLastActivity() {
+			return m_lastActivity;
+		}
+
+	protected:
+		Component *m_component;
+		Swift::JID m_initiator;
+		Swift::JID m_to;
+
+	private:
+		std::string m_id;
+		// This is used to remove AdHocCommand after long inactivity to prevent memory leaks
+		// caused by users which disconnect before they finish the command.
+		// AdHocManager uses this to garbage collect old AdHocCommands.
+		time_t m_lastActivity;
+};
+
+}