diff --git a/azure-cli.spec b/azure-cli.spec
index f14abaf..f672c83 100644
--- a/azure-cli.spec
+++ b/azure-cli.spec
@@ -28,7 +28,8 @@ Patch1:         ac_use-python3-by-default.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  unzip
-Requires:       azure-cli-nspkg
+BuildRequires:  azure-cli-nspkg
+BuildRequires:  python3-azure-nspkg
 Requires:       python3-azure-nspkg
 Requires:       azure-cli-acr
 Requires:       azure-cli-acs
@@ -71,7 +72,7 @@ Conflicts:      azure-cli < 2.0.0
 BuildArch:      noarch
 
 %description
-Microsoft Azure CLI 2.0
+Microsoft Azure CLI 2.0 Command Line Utilities
 
 %prep
 %setup -q -n azure-cli-%{version}
@@ -84,18 +85,18 @@ python3 setup.py build
 %install
 python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib}
 install -DTm644 %{buildroot}%{_bindir}/az.completion.sh %{buildroot}/etc/bash_completion.d/az.completion.sh
+rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.*
+rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__pycache__
+rm -rf %{buildroot}%{python3_sitelib}/azure/__init__.*
+rm -rf %{buildroot}%{python3_sitelib}/azure/__pycache__
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt README.rst
-%exclude %{python3_sitelib}/azure/cli/__pycache__/__init__.*py*
-%exclude %{python3_sitelib}/azure/cli/__init__.*py*
-%exclude %{python3_sitelib}/azure/__pycache__/__init__.*py*
-%exclude %{python3_sitelib}/azure/__init__.*py*
 %{_bindir}/az
 %config /etc/bash_completion.d/az.completion.sh
 %exclude /usr/bin/az.bat
 %exclude /usr/bin/az.completion.sh
-%{python3_sitelib}/*
-
+%{python3_sitelib}/azure/cli
+%{python3_sitelib}/azure_cli-*.egg-info
 %changelog