diff --git a/src/apps/haiku-depot/Jamfile b/src/apps/haiku-depot/Jamfile
index 4117c24b61..ffc7afcc58 100644
--- a/src/apps/haiku-depot/Jamfile
+++ b/src/apps/haiku-depot/Jamfile
@@ -12,6 +12,7 @@ for sourceDir in $(sourceDirs) {
 	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps haiku-depot $(sourceDir) ] ;
 }
 
+	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers package ] ;
 local textDocumentSources =
 	Bullet.cpp
 	BulletData.cpp
@@ -46,6 +47,10 @@ Application HaikuDepot :
 	PackageManager.cpp
 	support.cpp
 
+	# package_daemon
+	ProblemWindow.cpp
+	ResultWindow.cpp
+
 	# text view stuff
 	$(textDocumentSources)
 
diff --git a/src/apps/haiku-depot/PackageManager.cpp b/src/apps/haiku-depot/PackageManager.cpp
index 6aefcadcc2..5ed1474ca9 100644
--- a/src/apps/haiku-depot/PackageManager.cpp
+++ b/src/apps/haiku-depot/PackageManager.cpp
@@ -22,7 +22,10 @@
 #include <package/solver/SolverProblem.h>
 #include <package/solver/SolverProblemSolution.h>
 
+#include "AutoDeleter.h"
 #include "AutoLocker.h"
+#include "ProblemWindow.h"
+#include "ResultWindow.h"
 
 
 #undef B_TRANSLATION_CONTEXT
@@ -30,16 +33,14 @@
 
 
 using namespace BPackageKit::BPrivate;
+using namespace BPackageKit::BManager::BPrivate;
 
 using BPackageKit::BRefreshRepositoryRequest;
 using BPackageKit::DownloadFileRequest;
-using BPackageKit::BManager::BPrivate::BException;
-using BPackageKit::BManager::BPrivate::BFatalErrorException;
 using BPackageKit::BSolver;
 using BPackageKit::BSolverPackage;
 using BPackageKit::BSolverRepository;
 
-
 // #pragma mark - PackageAction
 
 
@@ -139,7 +140,8 @@ PackageManager::PackageManager(BPackageInstallationLocation location)
 	fDecisionProvider(),
 	fJobStateListener(),
 	fContext(fDecisionProvider, fJobStateListener),
-	fClientInstallationInterface()
+	fClientInstallationInterface(),
+	fProblemWindow(NULL)
 {
 	fInstallationInterface = &fClientInstallationInterface;
 	fRequestHandler = this;
@@ -160,6 +162,9 @@ PackageManager::~PackageManager()
 	delete_sem(fPendingActionsSem);
 	status_t result;
 	wait_for_thread(fPendingActionsWorker, &result);
+
+	if (fProblemWindow != NULL)
+		fProblemWindow->PostMessage(B_QUIT_REQUESTED);
 }
 
 
@@ -278,14 +283,39 @@ PackageManager::DownloadPackage(const BString& fileURL,
 void
 PackageManager::HandleProblems()
 {
-	// TODO: implement
+	if (fProblemWindow == NULL)
+		fProblemWindow = new ProblemWindow;
+
+	ProblemWindow::SolverPackageSet dummy;
+	if (!fProblemWindow->Go(fSolver,dummy, dummy))
+		throw BAbortedByUserException();
 }
 
 
 void
 PackageManager::ConfirmChanges(bool fromMostSpecific)
 {
-	// TODO: implement
+	ResultWindow* window = new ResultWindow;
+	ObjectDeleter<ResultWindow> windowDeleter(window);
+
+	bool hasOtherChanges = false;
+	int32 count = fInstalledRepositories.CountItems();
+	if (fromMostSpecific) {
+		for (int32 i = count - 1; i >= 0; i--)
+			hasOtherChanges
+				|= _AddResults(*fInstalledRepositories.ItemAt(i), window);
+	} else {
+		for (int32 i = 0; i < count; i++)
+			hasOtherChanges
+				|= _AddResults(*fInstalledRepositories.ItemAt(i), window);
+	}
+
+	if (!hasOtherChanges)
+		return;
+
+	// show the window
+	if (windowDeleter.Detach()->Go() == 0)
+		throw BAbortedByUserException();
 }
 
 
@@ -338,3 +368,19 @@ PackageManager::_PackageActionWorker(void* arg)
 
 	return 0;
 }
+
+
+bool
+PackageManager::_AddResults(InstalledRepository& repository,
+	ResultWindow* window)
+{
+	if (!repository.HasChanges())
+		return false;
+
+	ProblemWindow::SolverPackageSet dummy;
+	return window->AddLocationChanges(repository.Name(),
+		repository.PackagesToActivate(), dummy,
+		repository.PackagesToDeactivate(), dummy);
+}
+
+
diff --git a/src/apps/haiku-depot/PackageManager.h b/src/apps/haiku-depot/PackageManager.h
index a469594698..141fbf7c89 100644
--- a/src/apps/haiku-depot/PackageManager.h
+++ b/src/apps/haiku-depot/PackageManager.h
@@ -19,6 +19,8 @@
 
 
 class PackageManager;
+class ProblemWindow;
+class ResultWindow;
 
 
 class PackageAction : public BReferenceable {
@@ -94,6 +96,11 @@ private:
 private:
 		static	status_t		_PackageActionWorker(void* arg);
 
+				bool			_AddResults(
+									BPackageManager::InstalledRepository&
+										repository,
+									ResultWindow* window);
+
 private:
 			DecisionProvider	fDecisionProvider;
 			JobStateListener	fJobStateListener;
@@ -105,6 +112,7 @@ private:
 			PackageActionList	fPendingActions;
 			BLocker				fPendingActionsLock;
 			sem_id				fPendingActionsSem;
+			ProblemWindow*		fProblemWindow;
 };
 
 #endif // PACKAGE_MANAGER_H