diff --git a/Makefile b/Makefile
index 6076fdb..c41c4ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME := R-NMF
-URL = https://cran.r-project.org/src/contrib/NMF_0.23.0.tar.gz
+URL = https://cran.r-project.org/src/contrib/NMF_0.21.0.tar.gz
 ARCHIVES = 
 
 include ../common/Makefile.common
diff --git a/R-NMF.spec b/R-NMF.spec
index e350737..89b18a2 100644
--- a/R-NMF.spec
+++ b/R-NMF.spec
@@ -3,14 +3,14 @@
 # Generated by: autospec.py
 #
 Name     : R-NMF
-Version  : 0.23.0
-Release  : 38
-URL      : https://cran.r-project.org/src/contrib/NMF_0.23.0.tar.gz
-Source0  : https://cran.r-project.org/src/contrib/NMF_0.23.0.tar.gz
+Version  : 0.21.0
+Release  : 39
+URL      : https://cran.r-project.org/src/contrib/NMF_0.21.0.tar.gz
+Source0  : https://cran.r-project.org/src/contrib/NMF_0.21.0.tar.gz
 Summary  : Algorithms and Framework for Nonnegative Matrix Factorization
 Group    : Development/Tools
 License  : GPL-2.0+
-Requires: R-BiocManager
+Requires: R-NMF-lib = %{version}-%{release}
 Requires: R-RColorBrewer
 Requires: R-colorspace
 Requires: R-digest
@@ -23,7 +23,6 @@ Requires: R-registry
 Requires: R-reshape2
 Requires: R-rngtools
 Requires: R-stringr
-BuildRequires : R-BiocManager
 BuildRequires : R-RColorBrewer
 BuildRequires : R-colorspace
 BuildRequires : R-digest
@@ -45,6 +44,14 @@ Factorization (NMF). The package implements a set of already published algorithm
     in C++, and the main interface function provides an easy way of performing
     parallel computations on multicore machines.
 
+%package lib
+Summary: lib components for the R-NMF package.
+Group: Libraries
+
+%description lib
+lib components for the R-NMF package.
+
+
 %prep
 %setup -q -c -n NMF
 cd %{_builddir}/NMF
@@ -54,10 +61,10 @@ export http_proxy=http://127.0.0.1:9/
 export https_proxy=http://127.0.0.1:9/
 export no_proxy=localhost,127.0.0.1,0.0.0.0
 export LANG=C.UTF-8
-export SOURCE_DATE_EPOCH=1636041953
+export SOURCE_DATE_EPOCH=1646087848
 
 %install
-export SOURCE_DATE_EPOCH=1636041953
+export SOURCE_DATE_EPOCH=1646087848
 rm -rf %{buildroot}
 export LANG=C.UTF-8
 export CFLAGS="$CFLAGS -O3 -flto -fno-semantic-interposition "
@@ -98,3 +105,48 @@ R CMD check --no-manual --no-examples --no-codoc NMF || :
 
 %files
 %defattr(-,root,root,-)
+/usr/lib64/R/library/NMF/CITATION
+/usr/lib64/R/library/NMF/DESCRIPTION
+/usr/lib64/R/library/NMF/INDEX
+/usr/lib64/R/library/NMF/Meta/Rd.rds
+/usr/lib64/R/library/NMF/Meta/data.rds
+/usr/lib64/R/library/NMF/Meta/demo.rds
+/usr/lib64/R/library/NMF/Meta/features.rds
+/usr/lib64/R/library/NMF/Meta/hsearch.rds
+/usr/lib64/R/library/NMF/Meta/links.rds
+/usr/lib64/R/library/NMF/Meta/nsInfo.rds
+/usr/lib64/R/library/NMF/Meta/package.rds
+/usr/lib64/R/library/NMF/Meta/vignette.rds
+/usr/lib64/R/library/NMF/NAMESPACE
+/usr/lib64/R/library/NMF/NEWS
+/usr/lib64/R/library/NMF/R/NMF
+/usr/lib64/R/library/NMF/R/NMF.rdb
+/usr/lib64/R/library/NMF/R/NMF.rdx
+/usr/lib64/R/library/NMF/REFERENCES.bib
+/usr/lib64/R/library/NMF/data/esGolub.rda
+/usr/lib64/R/library/NMF/demo/aheatmap.R
+/usr/lib64/R/library/NMF/demo/heatmaps.R
+/usr/lib64/R/library/NMF/demo/nmf.R
+/usr/lib64/R/library/NMF/doc/NMF-vignette.R
+/usr/lib64/R/library/NMF/doc/NMF-vignette.Rnw
+/usr/lib64/R/library/NMF/doc/NMF-vignette.pdf
+/usr/lib64/R/library/NMF/doc/consensus.pdf
+/usr/lib64/R/library/NMF/doc/heatmaps.R
+/usr/lib64/R/library/NMF/doc/heatmaps.Rnw
+/usr/lib64/R/library/NMF/doc/heatmaps.pdf
+/usr/lib64/R/library/NMF/doc/index.html
+/usr/lib64/R/library/NMF/help/AnIndex
+/usr/lib64/R/library/NMF/help/NMF.rdb
+/usr/lib64/R/library/NMF/help/NMF.rdx
+/usr/lib64/R/library/NMF/help/aliases.rds
+/usr/lib64/R/library/NMF/help/paths.rds
+/usr/lib64/R/library/NMF/html/00Index.html
+/usr/lib64/R/library/NMF/html/R.css
+/usr/lib64/R/library/NMF/scripts/grid.R
+/usr/lib64/R/library/NMF/scripts/report.Rmd
+
+%files lib
+%defattr(-,root,root,-)
+/usr/lib64/R/library/NMF/libs/NMF.so
+/usr/lib64/R/library/NMF/libs/NMF.so.avx2
+/usr/lib64/R/library/NMF/libs/NMF.so.avx512
diff --git a/options.conf b/options.conf
index 59ff646..7898924 100644
--- a/options.conf
+++ b/options.conf
@@ -1,6 +1,6 @@
 [package]
 name = R-NMF
-url = https://cran.r-project.org/src/contrib/NMF_0.23.0.tar.gz
+url = https://cran.r-project.org/src/contrib/NMF_0.21.0.tar.gz
 archives = 
 giturl = 
 domain = 
diff --git a/release b/release
index e522732..a272009 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-38
+39
diff --git a/testresults b/testresults
index 92c6b06..8581a68 100644
--- a/testresults
+++ b/testresults
@@ -1,5 +1,5 @@
-Total : 0
-Pass : 0
-Fail : 0
-Skip : 0
+Total : 50
+Pass : 43
+Fail : 5
+Skip : 2
 XFail : 0
diff --git a/upstream b/upstream
index 41e65a4..b4b1c1f 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-6caadce58f7d99a4aa66cf7d756842e8d76d18f5/NMF_0.23.0.tar.gz
+a4fab48e8d7d3dec8f02e9d286351b5170aa3e14/NMF_0.21.0.tar.gz
diff --git a/versions b/versions
index ca222b7..8854156 100644
--- a/versions
+++ b/versions
@@ -1 +1 @@
-0.23.0
+0.21.0