diff --git a/core/Session.php b/core/Session.php
index f7ee5f3d3..8bdba0df5 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -91,6 +91,8 @@ class Session {
 
 	protected static $cookie_path;
 
+	protected static $cookie_secure = false;
+
 	/**
 	 * Session data
 	 */
@@ -140,6 +142,22 @@ class Session {
 		}
 	}
 
+	/**
+	 * Secure cookie, tells the browser to only send it over SSL.
+	 * @param boolean $secure
+	 */
+	public static function set_cookie_secure($secure) {
+		self::$cookie_secure = (bool) $secure;
+	}
+
+	/**
+	 * Get if the cookie is secure
+	 * @return boolean
+	 */
+	public static function get_cookie_secure() {
+		return (bool) self::$cookie_secure;
+	}
+
 	/**
 	 * Create a new session object, with the given starting data
 	 *
@@ -411,12 +429,13 @@ class Session {
 		self::load_config();
 		$path = self::get_cookie_path();
 		$domain = self::get_cookie_domain();
+		$secure = self::get_cookie_secure();
 
 		if(!session_id() && !headers_sent()) {
 			if($domain) {
-				session_set_cookie_params(self::$timeout, $path, $domain, false /* secure */, true /* httponly */);
+				session_set_cookie_params(self::$timeout, $path, $domain, $secure /* secure */, true /* httponly */);
 			} else {
-				session_set_cookie_params(self::$timeout, $path, null, false /* secure */, true /* httponly */);
+				session_set_cookie_params(self::$timeout, $path, null, $secure /* secure */, true /* httponly */);
 			}
 
 			// @ is to supress win32 warnings/notices when session wasn't cleaned up properly