diff --git a/requirements.txt b/requirements.txt
index 855f681..7ab55b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,7 @@ passlib==1.7.4
 # Trac plugins
 TracSpamFilter[dns,spambayes] @ svn+https://svn.edgewall.org/repos/trac/plugins/trunk/spam-filter@17766
 TracDragDrop @ svn+https://trac-hacks.org/svn/tracdragdropplugin/0.12@18635
+TracDynamicFields==2.5.0
 
 # No pypi release compatible with trac 1.6 yet
 trac-github[oauth] @ git+https://github.com/bmispelon/trac-github.git@trac-1.6-py3
diff --git a/trac-env/conf/trac.ini b/trac-env/conf/trac.ini
index d8bb307..aafa734 100644
--- a/trac-env/conf/trac.ini
+++ b/trac-env/conf/trac.ini
@@ -10,6 +10,7 @@ max_diff_files = 0
 wiki_format_messages = enabled
 
 [components]
+dynfields.* = enabled
 trac.about.* = disabled
 trac.admin.web_ui.PluginAdminPanel = disabled
 trac.ticket.query.* = enabled
@@ -208,26 +209,29 @@ restrict_owner = disabled
 easy = checkbox
 easy.label = Easy pickings
 easy.order = 60
-has_patch = checkbox
-has_patch.label = Has patch
-has_patch.order = 20
-needs_better_patch = checkbox
-needs_better_patch.label = Patch needs improvement
-needs_better_patch.order = 50
-needs_better_patch.value = 0
 needs_docs = checkbox
 needs_docs.label = Needs documentation
 needs_docs.order = 30
 needs_docs.value = 0
+needs_docs.show_when_solution_status = Needs Improvement
 needs_tests = checkbox
 needs_tests.label = Needs tests
-needs_tests.order = 40
+needs_tests.order = 50
 needs_tests.value = 0
+needs_tests.show_when_solution_status = Needs Improvement
 stage = select
 stage.label = Triage Stage
 stage.options = Unreviewed|Accepted|Ready for checkin|Someday/Maybe
 stage.order = 10
 stage.value = 0
+solution_status = select
+solution_status.show_when_stage = Accepted
+solution_status.label = Solution Status
+solution_status.options = |Needs Patch|Needs Review|Needs Improvement
+solution_status.order = 40
+solution_status.value =
+solution_status.invalid_if =
+solution_status.clear_on_hide = true
 ui_ux = checkbox
 ui_ux.label = UI/UX
 ui_ux.order = 70