diff --git a/README.md b/README.md
index 1a86388b..28abd4a6 100644
--- a/README.md
+++ b/README.md
@@ -58,11 +58,11 @@ sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev l
 
 2. To build with the wingpanel indicator:
    ```bash
-   meson builddir --prefix=/usr -Dindicator-wingpanel=enabled
+   meson setup -Dindicator-wingpanel=enabled build
    ```
    Alternatively, to build without the wingpanel indicator:
    ```bash
-   meson builddir --prefix=/usr
+   meson setup build
    ```
 
 3. Install:
diff --git a/meson.build b/meson.build
index 5cefae22..f31f3dfb 100644
--- a/meson.build
+++ b/meson.build
@@ -71,4 +71,4 @@ subdir('src')
 meson.add_install_script('meson/post_install.py')
 
 subdir('po')
-# subdir('tests')
\ No newline at end of file
+# subdir('tests')
diff --git a/src/Indicator/meson.build b/src/Indicator/meson.build
new file mode 100644
index 00000000..6f946c97
--- /dev/null
+++ b/src/Indicator/meson.build
@@ -0,0 +1,25 @@
+source_indicator_files = [
+    'Indicator.vala',
+    'Services/DBusClient.vala',
+    'Widgets/DisplayWidget.vala',
+    'Widgets/IndicatorWidget.vala',
+    'Widgets/PopoverWidget.vala',
+
+    meson.project_source_root() / 'src' / 'Resources/ResourcesSerialized.vala',
+    meson.project_source_root() / 'src' / 'Utils.vala',
+]
+
+wingpanel_dep = dependency('wingpanel', version: '>=2.1.0')
+
+indicator_dependencies = [
+    wingpanel_dep
+]
+
+shared_module(
+    'monitor',
+    source_indicator_files,
+    icons_gresource,
+    dependencies: indicator_dependencies,
+    install: true,
+    install_dir : wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]),
+)
diff --git a/src/meson.build b/src/meson.build
index f8505609..9e4b1bec 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -85,18 +85,6 @@ source_app_files = [
 
 ]
 
-source_indicator_files = [
-    'Indicator/Indicator.vala',
-    'Utils.vala',
-    'Resources/ResourcesSerialized.vala',
-
-    'Indicator/Widgets/DisplayWidget.vala',
-    'Indicator/Widgets/PopoverWidget.vala',
-    'Indicator/Widgets/IndicatorWidget.vala',
-
-    'Indicator/Services/DBusClient.vala',
-]
-
 executable(
     meson.project_name(),
     icons_gresource,
@@ -108,15 +96,6 @@ executable(
 )
 
 if get_option('indicator-wingpanel').enabled()
-    message ('Indicator Wingpanel will be built') 
-    wingpanel_dep = dependency('wingpanel', version: '>=2.1.0')
-    app_dependencies += [wingpanel_dep]
-    shared_module(
-        'monitor',
-        source_indicator_files,
-        icons_gresource,
-        dependencies: app_dependencies,
-        install: true,
-        install_dir : wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]),
-    )
+    message ('Indicator Wingpanel will be built')
+    subdir('Indicator')
 endif