diff --git a/.gitignore b/.gitignore
index 04deb43..449be6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/.phpunit.result.cache
+/.psalm-cache
/docs/html/
/laminas-mkdoc-theme.tgz
/laminas-mkdoc-theme/
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
new file mode 100644
index 0000000..cb4d834
--- /dev/null
+++ b/psalm-baseline.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ $options
+
+
+
+
+ $container
+ $name
+
+
+
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 378b029..19d8be1 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -1,10 +1,14 @@