diff --git a/include/Swiften/Server/Server.h b/include/Swiften/Server/Server.h
index 9ae486aa9dfa8e67d0f5e2ba027e1f36a8580176..f3d700601bb1ba75e22dcba5c27b010f4def69c1 100644
--- a/include/Swiften/Server/Server.h
+++ b/include/Swiften/Server/Server.h
@@ -21,7 +21,7 @@
 #include "Swiften/Entity/Entity.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
-#include "Swiften/TLS/PKCS12Certificate.h"
+#include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 
 namespace Swift {
@@ -60,7 +60,7 @@ namespace Swift {
 			boost::signal<void (const SafeByteArray&)> onDataRead;
 			boost::signal<void (const SafeByteArray&)> onDataWritten;
 
-			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, const PKCS12Certificate& cert);
+			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, CertificateWithKey::ref cert);
 
 		private:
 			void handleNewClientConnection(boost::shared_ptr<Connection> c);
@@ -84,7 +84,7 @@ namespace Swift {
 			StanzaChannel *stanzaChannel_;
 			IQRouter *iqRouter_;
 			TLSServerContextFactory *tlsFactory;
-			PKCS12Certificate cert;
+			CertificateWithKey::ref cert;
 			PlatformXMLParserFactory *parserFactory_;
 	};
 }