diff --git a/source/dub/commandline.d b/source/dub/commandline.d
index e61a58b..ad92ad8 100644
--- a/source/dub/commandline.d
+++ b/source/dub/commandline.d
@@ -15,6 +15,7 @@
 import dub.internal.vibecompat.core.log;
 import dub.internal.vibecompat.inet.url;
 import dub.package_;
+import dub.packagemanager;
 import dub.packagesupplier;
 import dub.project;
 import dub.internal.utils : getDUBVersion;
@@ -108,7 +109,10 @@
 			new AddLocalCommand,
 			new RemoveLocalCommand,
 			new ListCommand,
-			new ListInstalledCommand
+			new ListInstalledCommand,
+			new AddOverrideCommand,
+			new RemoveOverrideCommand,
+			new ListOverridesCommand,
 		)
 	];
 
@@ -972,11 +976,6 @@
 	}
 }
 
-
-/******************************************************************************/
-/* LIST                                                                       */
-/******************************************************************************/
-
 class ListCommand : Command {
 	this()
 	{
@@ -1010,6 +1009,111 @@
 
 
 /******************************************************************************/
+/* OVERRIDES                                                                  */
+/******************************************************************************/
+
+class AddOverrideCommand : Command {
+	private {
+		bool m_system = false;
+	}
+
+	this()
+	{
+		this.name = "add-override";
+		this.argumentsPattern = "<package> <version-spec> <target-path/target-version>";
+		this.description = "Adds a new package override.";
+		this.helpText = [
+		];
+	}
+
+	override void prepare(scope CommandArgs args)
+	{
+		args.getopt("system", &m_system, [
+			"Register system-wide instead of user-wide"
+		]);
+	}
+
+	override int execute(Dub dub, string[] free_args, string[] app_args)
+	{
+		enforceUsage(app_args.length == 0, "Unexpected application arguments.");
+		enforceUsage(free_args.length == 3, "Expected three arguments, not "~free_args.length.to!string);
+		auto scope_ = m_system ? LocalPackageType.system : LocalPackageType.user;
+		auto pack = free_args[0];
+		auto ver = Dependency(free_args[1]);
+		if (existsFile(Path(free_args[2]))) {
+			auto target = Path(free_args[2]);
+			dub.packageManager.addOverride(scope_, pack, ver, target);
+			logInfo("Added override %s %s => %s", pack, ver, target);
+		} else {
+			auto target = Version(free_args[2]);
+			dub.packageManager.addOverride(scope_, pack, ver, target);
+			logInfo("Added override %s %s => %s", pack, ver, target);
+		}
+		return 0;
+	}
+}
+
+class RemoveOverrideCommand : Command {
+	private {
+		bool m_system = false;
+	}
+
+	this()
+	{
+		this.name = "remove-override";
+		this.argumentsPattern = "<package> <version-spec>";
+		this.description = "Removes an existing package override.";
+		this.helpText = [
+		];
+	}
+
+	override void prepare(scope CommandArgs args)
+	{
+		args.getopt("system", &m_system, [
+			"Register system-wide instead of user-wide"
+		]);
+	}
+
+	override int execute(Dub dub, string[] free_args, string[] app_args)
+	{
+		enforceUsage(app_args.length == 0, "Unexpected application arguments.");
+		enforceUsage(free_args.length == 2, "Expected two arguments, not "~free_args.length.to!string);
+		auto scope_ = m_system ? LocalPackageType.system : LocalPackageType.user;
+		dub.packageManager.removeOverride(scope_, free_args[0], Dependency(free_args[1]));
+		return 0;
+	}
+}
+
+class ListOverridesCommand : Command {
+	this()
+	{
+		this.name = "list-overrides";
+		this.argumentsPattern = "";
+		this.description = "Prints a list of all local package overrides";
+		this.helpText = [
+			"Prints a list of all overriden packages added via \"dub add-override\"."
+		];
+	}
+	override void prepare(scope CommandArgs args) {}
+	override int execute(Dub dub, string[] free_args, string[] app_args)
+	{
+		void printList(in PackageOverride[] overrides, string caption)
+		{
+			if (overrides.length == 0) return;
+			logInfo("# %s", caption);
+			foreach (ovr; overrides) {
+				if (!ovr.targetPath.empty) logInfo("%s %s => %s", ovr.package_, ovr.version_, ovr.targetPath);
+				else logInfo("%s %s => %s", ovr.package_, ovr.version_, ovr.targetVersion);
+			}
+		}
+		printList(dub.packageManager.getOverrides(LocalPackageType.user), "User wide overrides");
+		printList(dub.packageManager.getOverrides(LocalPackageType.system), "System wide overrides");
+		return 0;
+	}
+}
+
+
+/******************************************************************************/
 /* DUSTMITE                                                                   */
 /******************************************************************************/
 
diff --git a/source/dub/dependency.d b/source/dub/dependency.d
index 368669e..0f1bfee 100644
--- a/source/dub/dependency.d
+++ b/source/dub/dependency.d
@@ -56,7 +56,7 @@
 			ves = ">=0.0.0";
 		}
 
-		if (ves[0] == Version.BRANCH_IDENT && ves[1] == '>') {
+		if (ves.startsWith("~>")) {
 			// Shortcut: "~>x.y.z" variant. Last non-zero number will indicate
 			// the base for this so something like this: ">=x.y.z <x.(y+1).z"
 			m_cmpA = ">=";
diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d
index b52f927..4eae6a2 100644
--- a/source/dub/packagemanager.d
+++ b/source/dub/packagemanager.d
@@ -26,16 +26,6 @@
 import std.zip;
 
 
-enum JournalJsonFilename = "journal.json";
-enum LocalPackagesFilename = "local-packages.json";
-enum LocalOverridesFilename = "local-overrides.json";
-
-
-enum LocalPackageType {
-	user,
-	system
-}
-
 /// The PackageManager can retrieve present packages and get / remove
 /// packages.
 class PackageManager {
@@ -244,6 +234,43 @@
 		return &iterator;
 	}
 
+
+	/** Returns a list of all package overrides for the given scope.
+	*/
+	const(PackageOverride)[] getOverrides(LocalPackageType scope_)
+	const {
+		return m_repositories[scope_].overrides;
+	}
+
+	/** Adds a new override for the given package.
+	*/
+	void addOverride(LocalPackageType scope_, string package_, Dependency version_spec, Version target)
+	{
+		m_repositories[scope_].overrides ~= PackageOverride(package_, version_spec, target);
+		writeLocalPackageOverridesFile(scope_);
+	}
+	/// ditto
+	void addOverride(LocalPackageType scope_, string package_, Dependency version_spec, Path target)
+	{
+		m_repositories[scope_].overrides ~= PackageOverride(package_, version_spec, target);
+		writeLocalPackageOverridesFile(scope_);
+	}
+
+	/** Removes an existing package override.
+	*/
+	void removeOverride(LocalPackageType scope_, string package_, Dependency version_spec)
+	{
+		Repository* rep = &m_repositories[scope_];
+		foreach (i, ovr; rep.overrides) {
+			if (ovr.package_ != package_ || ovr.version_ != version_spec)
+				continue;
+			rep.overrides = rep.overrides[0 .. i] ~ rep.overrides[i+1 .. $];
+			writeLocalPackageOverridesFile(scope_);
+			return;
+		}
+		throw new Exception(format("No override exists for %s %s", package_, version_spec));
+	}
+
 	/// Extracts the package supplied as a path to it's zip file to the
 	/// destination and sets a version field in the package description.
 	Package storeFetchedPackage(Path zip_file_path, Json package_info, Path destination)
@@ -610,7 +637,7 @@
 		void loadOverrides(LocalPackageType type)
 		{
 			m_repositories[type].overrides = null;
-			auto ovrfilepath = m_repositories[LocalPackageType.user].packagePath ~ LocalOverridesFilename;
+			auto ovrfilepath = m_repositories[type].packagePath ~ LocalOverridesFilename;
 			if (existsFile(ovrfilepath)) {
 				foreach (entry; jsonFromFile(ovrfilepath)) {
 					PackageOverride ovr;
@@ -679,6 +706,22 @@
 		writeJsonFile(path ~ LocalPackagesFilename, Json(newlist));
 	}
 
+	private void writeLocalPackageOverridesFile(LocalPackageType type)
+	{
+		Json[] newlist;
+		foreach (ovr; m_repositories[type].overrides) {
+			auto jovr = Json.emptyObject;
+			jovr.name = ovr.package_;
+			jovr["version"] = ovr.version_.toString();
+			if (!ovr.targetPath.empty) jovr.targetPath = ovr.targetPath.toNativeString();
+			else jovr.targetVersion = ovr.targetVersion.toString();
+			newlist ~= jovr;
+		}
+		auto path = m_repositories[type].packagePath;
+		if (!existsDirectory(path)) mkdirRecurse(path.toNativeString());
+		writeJsonFile(path ~ LocalOverridesFilename, Json(newlist));
+	}
+
 	/// Adds the package and scans for subpackages.
 	private void addPackages(ref Package[] dst_repos, Package pack)
 	const {
@@ -705,6 +748,36 @@
 	}
 }
 
+struct PackageOverride {
+	string package_;
+	Dependency version_;
+	Version targetVersion;
+	Path targetPath;
+
+	this(string package_, Dependency version_, Version target_version)
+	{
+		this.package_ = package_;
+		this.version_ = version_;
+		this.targetVersion = target_version;
+	}
+
+	this(string package_, Dependency version_, Path target_path)
+	{
+		this.package_ = package_;
+		this.version_ = version_;
+		this.targetPath = target_path;
+	}
+}
+
+enum LocalPackageType {
+	user,
+	system
+}
+
+enum JournalJsonFilename = "journal.json";
+enum LocalPackagesFilename = "local-packages.json";
+enum LocalOverridesFilename = "local-overrides.json";
+
 
 private struct Repository {
 	Path path;
@@ -721,18 +794,12 @@
 }
 
 
-private struct PackageOverride {
-	string package_;
-	Dependency version_;
-	Version targetVersion;
-	Path targetPath;
-}
-
-
-/**
+/*
 	Retrieval journal for later removal, keeping track of placed files
 	files.
+
 	Example Json:
+	---
 	{
 		"version": 1,
 		"files": {
@@ -740,6 +807,7 @@
 			...
 		}
 	}
+	---
 */
 private class Journal {
 	private enum Version = 1;